[FFmpeg-cvslog] Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'
Michael Niedermayer
git at videolan.org
Thu Sep 19 13:02:23 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 19 12:55:26 2013 +0200| [32ea39f56d90585c63eedfcb631e0a939fc1f95e] | committer: Michael Niedermayer
Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'
* commit '1914e6f010b3320025c7b692aaea51d9b9a992a8':
aacdec: Add support for LD (Low Delay) AAC
Conflicts:
Changelog
libavcodec/aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32ea39f56d90585c63eedfcb631e0a939fc1f95e
---
More information about the ffmpeg-cvslog
mailing list