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)
commitdf804041bd42d79b8cd01d7599c0d1f69c4027ee
tree41428f2e817f1a92fb67370caa69df844adffc93
parent17ebef2fc8094a235c0f30ce247c77659ea86539
parent6599b087de62a5f9f2a8d61a1952d777d1bff804
Merge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804'

* commit '6599b087de62a5f9f2a8d61a1952d777d1bff804':
  buffersrc: fix a typo.
  lavc, lavfi: fix counting number of planes in AVBufferRef wrappers

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