OSDN Git Service

Merge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:30:49 +0000 (11:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:30:56 +0000 (11:30 +0100)
* commit '6599b087de62a5f9f2a8d61a1952d777d1bff804':
  buffersrc: fix a typo.
  lavc, lavfi: fix counting number of planes in AVBufferRef wrappers

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

Simple merge
Simple merge