[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Thu Jan 9 21:04:50 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 9 20:56:49 2014 +0100| [268d93172460f116d239c2cf815d7b2f495efb2d] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ATRAC3+ decoder
Conflicts:
Changelog
configure
libavcodec/atrac3plus.c
libavcodec/atrac3plus.h
libavcodec/atrac3plus_data.h
libavcodec/atrac3plusdec.c
libavcodec/atrac3plusdsp.c
libavcodec/version.h
See: 2e1fb96af36348479e14aa85f445915ea09e70fa
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=268d93172460f116d239c2cf815d7b2f495efb2d
---
More information about the ffmpeg-cvslog
mailing list