Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 13:30:26 +0000 (14:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 13:30:33 +0000 (14:30 +0100)
* cigaes/master:
  lavfi/buffersink: fix header.
  lavfi/buffersrc: disable deprecated warnings.
  lavfi/buffersrc: check channel count changes.
  lavfi/buffersrc: set channel layout if it is known.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/buffersrc.c

Simple merge