a05a44e205
* commit '7e350379f87e7f74420b4813170fe808e2313911':
lavfi: switch to AVFrame.
Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
* Main merge operation, notably avfilter.c and video.c
* Switch to AVFrame:
- afade
- anullsrc
- apad
- aresample
- blackframe
- deshake
- idet
- il
- mandelbrot
- mptestsrc
- noise
- setfield
- smartblur
- tinterlace
* various merge changes and fixes in:
- ashowinfo
- blackdetect
- field
- fps
- select
- testsrc
- yadif
Nicolas George:
* Switch to AVFrame:
- make rawdec work with refcounted frames. Adapted from commit
759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov.
Also, fix the use of || instead of | in a flags check.
- make buffer sink and src, audio and video work all together
Clément Bœsch:
* Switch to AVFrame:
- aevalsrc
- alphaextract
- blend
- cellauto
- colormatrix
- concat
- earwax
- ebur128
- edgedetect
- geq
- histeq
- histogram
- hue
- kerndeint
- life
- movie
- mp (with the help of Michael)
- overlay
- pad
- pan
- pp
- pp
- removelogo
- sendcmd
- showspectrum
- showwaves
- silencedetect
- stereo3d
- subtitles
- super2xsai
- swapuv
- thumbnail
- tile
Hendrik Leppkes:
* Switch to AVFrame:
- aconvert
- amerge
- asetnsamples
- atempo
- biquads
Matthieu Bouron:
* Switch to AVFrame
- alphamerge
- decimate
- volumedetect
Stefano Sabatini:
* Switch to AVFrame:
- astreamsync
- flite
- framestep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
104 lines
3.4 KiB
C
104 lines
3.4 KiB
C
/*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVFILTER_AVCODEC_H
|
|
#define AVFILTER_AVCODEC_H
|
|
|
|
/**
|
|
* @file
|
|
* libavcodec/libavfilter gluing utilities
|
|
*
|
|
* This should be included in an application ONLY if the installed
|
|
* libavfilter has been compiled with libavcodec support, otherwise
|
|
* symbols defined below will not be available.
|
|
*/
|
|
|
|
#include "libavcodec/avcodec.h" // AVFrame
|
|
#include "avfilter.h"
|
|
|
|
/**
|
|
* Create and return a picref reference from the data and properties
|
|
* contained in frame.
|
|
*
|
|
* @param perms permissions to assign to the new buffer reference
|
|
*/
|
|
AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame, int perms);
|
|
|
|
|
|
/**
|
|
* Create and return a picref reference from the data and properties
|
|
* contained in frame.
|
|
*
|
|
* @param perms permissions to assign to the new buffer reference
|
|
*/
|
|
AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame,
|
|
int perms);
|
|
|
|
/**
|
|
* Create and return a buffer reference from the data and properties
|
|
* contained in frame.
|
|
*
|
|
* @param perms permissions to assign to the new buffer reference
|
|
*/
|
|
AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type,
|
|
const AVFrame *frame,
|
|
int perms);
|
|
|
|
#ifdef FF_API_FILL_FRAME
|
|
/**
|
|
* Fill an AVFrame with the information stored in samplesref.
|
|
*
|
|
* @param frame an already allocated AVFrame
|
|
* @param samplesref an audio buffer reference
|
|
* @return 0 in case of success, a negative AVERROR code in case of
|
|
* failure
|
|
* @deprecated Use avfilter_copy_buf_props() instead.
|
|
*/
|
|
attribute_deprecated
|
|
int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *samplesref);
|
|
|
|
/**
|
|
* Fill an AVFrame with the information stored in picref.
|
|
*
|
|
* @param frame an already allocated AVFrame
|
|
* @param picref a video buffer reference
|
|
* @return 0 in case of success, a negative AVERROR code in case of
|
|
* failure
|
|
* @deprecated Use avfilter_copy_buf_props() instead.
|
|
*/
|
|
attribute_deprecated
|
|
int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *picref);
|
|
|
|
/**
|
|
* Fill an AVFrame with information stored in ref.
|
|
*
|
|
* @param frame an already allocated AVFrame
|
|
* @param ref a video or audio buffer reference
|
|
* @return 0 in case of success, a negative AVERROR code in case of
|
|
* failure
|
|
* @deprecated Use avfilter_copy_buf_props() instead.
|
|
*/
|
|
attribute_deprecated
|
|
int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *ref);
|
|
#endif
|
|
|
|
#endif /* AVFILTER_AVCODEC_H */
|