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>
This commit is contained in:
commit
198e10b55c