Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'

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

Conflicts:
	libavcodec/ac3dec.c

See: 7aabeea9ba

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-14 12:05:08 +02:00
commit 198e10b55c

Diff Content Not Available