Merge commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 00:58:55 +0000 (01:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Feb 2015 00:59:44 +0000 (01:59 +0100)
commit20f5a179560ce844c9fa7886f60d61d4e2db7480
tree7e19bb0203482b4f3e004527fd445c0572f28c4e
parentabf357a9fb2f19467bad8e3e629f8b016091eedf
parent44dc138ed29c4dfbaf57ebc774da4c75ef113ca4
Merge commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4'

* commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4':
  rtpdec_mpeg4: reassemble fragmented AAC frames

Conflicts:
libavformat/rtpdec_mpeg4.c

See: fee2cc39becb1930461dff267389717337804a4a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec_mpeg4.c