[FFmpeg-cvslog] Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'
Michael Niedermayer
git at videolan.org
Mon Jul 7 23:30:03 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 7 23:16:59 2014 +0200| [242b3c292a49cc620fae6554ab74e748392d9197] | committer: Michael Niedermayer
Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'
* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=242b3c292a49cc620fae6554ab74e748392d9197
---
More information about the ffmpeg-cvslog
mailing list