Merge commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 22:39:04 +0000 (00:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 22:39:09 +0000 (00:39 +0200)
commit5c68e14e42c181f03d956465c557b7b890fd1983
treec170cb5ddbb623e8ee7e299eb00020f9c5f200df
parent86070b8e5a0e0ba087a9ce2a050c00094e29f35b
parentc2c9801bc9bce688d51d1a96f5f3ea93933e2dee
Merge commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee'

* commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee':
  lavfi: deprecate avfilter_graph_add_filter().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavfilter/avfilter.h
libavfilter/avfiltergraph.c