diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 02:09:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 02:09:53 +0200 |
| commit | 1c600888857544986d6576bc164e0dc8f0f4b6c7 (patch) | |
| tree | f4e77c53d1050223a9170f75e4ea719f29cd04eb /libavfilter/video.c | |
| parent | da728d5d2e7993911c7ed92c212ab900b7be180c (diff) | |
| parent | fe07c9c6b5a870b8f2ffcfac649228b4d76e9505 (diff) | |
| download | ffmpeg-1c600888857544986d6576bc164e0dc8f0f4b6c7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Only use optimizations with cmov if the CPU supports the instruction
x86: Add CPU flag for the i686 cmov instruction
x86: remove unused inline asm macros from dsputil_mmx.h
x86: move some inline asm macros to the only places they are used
lavfi: Add the af_channelmap audio channel mapping filter.
lavfi: add join audio filter.
lavfi: allow audio filters to request a given number of samples.
lavfi: support automatically inserting the fifo filter when needed.
lavfi/audio: eliminate ff_default_filter_samples().
Conflicts:
Changelog
libavcodec/x86/h264dsp_mmx.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/version.h
libavutil/x86/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/video.c')
| -rw-r--r-- | libavfilter/video.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavfilter/video.c b/libavfilter/video.c index ab6e2cd5b8..561abbc531 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -321,6 +321,11 @@ void ff_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) draw_slice(link, y, h, slice_dir); } +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) { @@ -330,10 +335,6 @@ void avfilter_default_start_frame(AVFilterLink *inlink, AVFilterBufferRef *picre { default_start_frame(inlink, picref); } -void avfilter_default_end_frame(AVFilterLink *inlink) -{ - default_end_frame(inlink); -} void avfilter_default_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { default_draw_slice(inlink, y, h, slice_dir); |