ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Mon Jun
1 12:59:44 2015 +0200| [c9b956161436fe9bf689fcb64c9e9253ec98997e] | committer:
Michael Niedermayer
Merge commit '1dcb68c02a55648facb82c0b2b6a1eb3dc18f988' into release/2.2
* commit '1dcb68c02a55648facb82c0b2b6a1eb3dc18f988':
alac: Reject rice_limit 0 if compression is used
Conflicts:
libavcodec/alac.c
See: 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9b956161436fe9bf689fcb64c9e9253ec98997e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
