[FFmpeg-cvslog] Merge commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4'
Michael Niedermayer
git at videolan.org
Sun Feb 22 02:09:53 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 22 01:58:55 2015 +0100| [20f5a179560ce844c9fa7886f60d61d4e2db7480] | committer: Michael Niedermayer
Merge commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4'
* commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4':
rtpdec_mpeg4: reassemble fragmented AAC frames
Conflicts:
libavformat/rtpdec_mpeg4.c
See: fee2cc39becb1930461dff267389717337804a4a
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20f5a179560ce844c9fa7886f60d61d4e2db7480
---
More information about the ffmpeg-cvslog
mailing list