Merge commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 18:48:28 +0000 (19:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 18:49:05 +0000 (19:49 +0100)
commitb5ca158935493f7242806f1bc59ea016672a1844
treebbe3fec0e0f1d8d9e6a0bd532d035a6a0368259f
parent87db7e777262a7800cc6c76e07870f7a8f6301ed
parent87e85a133f3ce2f037b90e9c7bbca99951df6c15
Merge commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15'

* commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15':
  aac: Relax reserved_bit validation

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