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 /libavformat/pcmenc.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 'libavformat/pcmenc.c')
0 files changed, 0 insertions, 0 deletions