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/avfiltergraph.h | |
| 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/avfiltergraph.h')
| -rw-r--r-- | libavfilter/avfiltergraph.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 7e47566129..f983bf8469 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -257,7 +257,7 @@ char *avfilter_graph_dump(AVFilterGraph *graph, const char *options); * of a filtergraph, only a convenience function to help drain a filtergraph * in a balanced way under normal circumstances. * - * @return the return value of avfilter_request_frame, + * @return the return value of ff_request_frame, * or AVERROR_EOF of all links returned AVERROR_EOF. */ int avfilter_graph_request_oldest(AVFilterGraph *graph); |