Merge commit 'ade75fb811500f3e3f284737f123938d83be728f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Jan 2014 20:46:27 +0000 (21:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Jan 2014 20:46:32 +0000 (21:46 +0100)
commit10f1ee2f923a700879687bc844b9deca7e750846
treea7ebf34723f904c996b486e350d5729410a16c09
parent3a5a039adee3ee928898df82e20c40212d618195
parentade75fb811500f3e3f284737f123938d83be728f
Merge commit 'ade75fb811500f3e3f284737f123938d83be728f'

* commit 'ade75fb811500f3e3f284737f123938d83be728f':
  (e)ac3: clip surround mix level indexes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec.c
libavcodec/eac3dec.c