Merge commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Nov 2013 04:05:09 +0000 (05:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Nov 2013 04:05:09 +0000 (05:05 +0100)
commitceaaf0d97e7fc11b850325201cf30d7b83e80fd2
tree3a292ada4a203edbd584d3e2b0dcad5fa45fac35
parentc0237d19a0269ff44e909434f1b2b645fad2d281
parent48b24bd2d208ce0f124029ac4c5ac5cb1fca4175
Merge commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175'

* commit '48b24bd2d208ce0f124029ac4c5ac5cb1fca4175':
  ac3dec: Fix out-of-array read

Conflicts:
libavcodec/ac3dec.c

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