ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun May 10
22:00:02 2015 +0200| [ce1c0e99e9f66616bcbdbc2de8ca077bdfa03aa7] | committer:
Michael Niedermayer
Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'
* commit '243e8443cd9e83c887e3f5edf09a169e7783d14e':
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=ce1c0e99e9f66616bcbdbc2de8ca077bdfa03aa7
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
