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/buffersrc.c | |
| parent | 052f4f859cfee9bb86ea3ccb0c56ea11d050ef17 (diff) | |
| parent | 1961e46c15c23a041f8d8614a25388a3ee9eff63 (diff) | |
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/buffersrc.c')
| -rw-r--r-- | libavfilter/buffersrc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 70013099ff..69aff6c92b 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -29,7 +29,6 @@ #include "formats.h" #include "internal.h" #include "video.h" -#include "vsrc_buffer.h" #include "avcodec.h" #include "libavutil/audioconvert.h" |