Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Jun 2012 22:34:36 +0000 (00:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Jun 2012 22:34:36 +0000 (00:34 +0200)
commit5916bc46581230c68c946c0b4733cce381eddcbd
tree016c3ddabcec1e8ff2b50a375d9377eb31319842
parent052f4f859cfee9bb86ea3ccb0c56ea11d050ef17
parent1961e46c15c23a041f8d8614a25388a3ee9eff63
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>
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/buffersrc.c
libavfilter/formats.c
libavfilter/formats.h
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/video.c