Commit 198e10b5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '68e57cde'

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

Conflicts:
	libavcodec/ac3dec.c

See: 7aabeea9Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b24e8f56 68e57cde
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment