Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Aug 2013 07:52:06 +0000 (09:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Aug 2013 07:52:06 +0000 (09:52 +0200)
commitd6c36fba0be8aaa7ba3f15f8a2a7b872817200f3
treeba6a2fdde37de88532c6174091d2a53fbc96aecd
parent48af87819a035816f2fd0270d4ac3e54143a86a2
parenta10c4ce24bd4a0dd557d5849aa53a0cc74677808
Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'

* commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808':
  aac: Forward errors properly in aac_decode_frame_int

Conflicts:
libavcodec/aacdec.c

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