From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 20 Mar 2013 10:30:49 +0000 (+0100)
Subject: Merge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804'
X-Git-Tag: android-x86-4.4-r1~4929
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=df804041bd42d79b8cd01d7599c0d1f69c4027ee;p=android-x86%2Fexternal-ffmpeg.git

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>
---

df804041bd42d79b8cd01d7599c0d1f69c4027ee