Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 10:05:08 +0000 (12:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 10:08:38 +0000 (12:08 +0200)
commit198e10b55cc908d9194d34013d212e4b5ff3b42f
tree9831b1a066ff8025b9e01f6c5c8adaef0a02930a
parentb24e8f566d0ccf281605b31e93f847ccb3b1544b
parent68e57cde68f3da4c557ca15491fda74d1ea6321e
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>