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)
* commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4':
  rtpdec_mpeg4: reassemble fragmented AAC frames

Conflicts:
libavformat/rtpdec_mpeg4.c

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

Simple merge