Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 11:58:57 +0000 (12:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Mar 2013 11:59:04 +0000 (12:59 +0100)
* qatar/master:
  lavc,lavfi: fix calculating the plane size in the AVBufferRef wrappers

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

Simple merge
Simple merge