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)
* commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee':
  lavfi: deprecate avfilter_graph_add_filter().

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

diff --cc doc/APIchanges
Simple merge
Simple merge
Simple merge