From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 14 Jul 2013 10:05:08 +0000 (+0200)
Subject: Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'
X-Git-Tag: android-x86-4.4-r1~2350
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=198e10b55cc908d9194d34013d212e4b5ff3b42f;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'

* commit '68e57cde68f3da4c557ca15491fda74d1ea6321e':
  ac3dec: Increment channel pointers only once per channel

Conflicts:
	libavcodec/ac3dec.c

See: 7aabeea9ba0e557e834c886de5ea4db8e9a5193d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

198e10b55cc908d9194d34013d212e4b5ff3b42f