diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 00:34:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-27 00:34:36 +0200 |
| commit | 5916bc46581230c68c946c0b4733cce381eddcbd (patch) | |
| tree | 016c3ddabcec1e8ff2b50a375d9377eb31319842 /libavfilter/video.c | |
| parent | 052f4f859cfee9bb86ea3ccb0c56ea11d050ef17 (diff) | |
| parent | 1961e46c15c23a041f8d8614a25388a3ee9eff63 (diff) | |
| download | ffmpeg-5916bc46581230c68c946c0b4733cce381eddcbd.tar.gz | |
Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'
* commit '1961e46c15c23a041f8d8614a25388a3ee9eff63':
lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft
lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft
lavfi: use proper FF_API guards for different deprecated functions
lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft
lavfi: remove disabled FF_API_SAMPLERATE64 cruft
lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft
Conflicts:
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersrc.c
libavfilter/formats.c
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/video.c
libavfilter/vsrc_buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/video.c')
| -rw-r--r-- | libavfilter/video.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/libavfilter/video.c b/libavfilter/video.c index 561abbc531..4e3de8d4b0 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -326,49 +326,3 @@ void avfilter_default_end_frame(AVFilterLink *inlink) default_end_frame(inlink); } -#if FF_API_FILTERS_PUBLIC -AVFilterBufferRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms, int w, int h) -{ - return ff_default_get_video_buffer(link, perms, w, h); -} -void avfilter_default_start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) -{ - default_start_frame(inlink, picref); -} -void avfilter_default_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) -{ - default_draw_slice(inlink, y, h, slice_dir); -} -AVFilterBufferRef *avfilter_null_get_video_buffer(AVFilterLink *link, int perms, int w, int h) -{ - return ff_null_get_video_buffer(link, perms, w, h); -} -void avfilter_null_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) -{ - ff_null_start_frame(link, picref); -} -void avfilter_null_end_frame(AVFilterLink *link) -{ - ff_null_end_frame(link); -} -void avfilter_null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) -{ - ff_null_draw_slice(link, y, h, slice_dir); -} -void avfilter_start_frame(AVFilterLink *link, AVFilterBufferRef *picref) -{ - ff_start_frame(link, picref); -} -void avfilter_end_frame(AVFilterLink *link) -{ - ff_end_frame(link); -} -void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) -{ - ff_draw_slice(link, y, h, slice_dir); -} -AVFilterBufferRef *avfilter_get_video_buffer(AVFilterLink *link, int perms, int w, int h) -{ - return ff_get_video_buffer(link, perms, w, h); -} -#endif |