[FFmpeg-cvslog] Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'
Michael Niedermayer
git at videolan.org
Sun May 4 01:24:07 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 4 01:14:30 2014 +0200| [32388e04a80139740e495639e3237e99de3b5662] | committer: Michael Niedermayer
Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'
* commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510':
probe: Support AAC_LATM in set_codec_from_probe_data
Conflicts:
libavformat/utils.c
See: 7bdc5de33d21411e5e742670d669d9908d47a1cd
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32388e04a80139740e495639e3237e99de3b5662
---
More information about the ffmpeg-cvslog
mailing list