ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Dec 2
21:29:48 2014 +0100| [61d0a6dd9554ecd705518d38d531363cdabab7d3] | committer:
Michael Niedermayer
Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'
* commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a':
aac: Simplify decode_mid_side_stereo
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61d0a6dd9554ecd705518d38d531363cdabab7d3
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
