[FFmpeg-cvslog] Merge commit 'cb5324200ccdc693dd5b28dcd7d4b722fad83ea2' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue May 19 21:19:35 2015 +0200| [2070149cbbf853e78efdada52ebdc8e958564f14] | committer: Michael Niedermayer

Merge commit 'cb5324200ccdc693dd5b28dcd7d4b722fad83ea2' into release/2.4

* commit 'cb5324200ccdc693dd5b28dcd7d4b722fad83ea2':
  alac: Reject rice_limit 0 if compression is used

Conflicts:
	libavcodec/alac.c

See: 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2070149cbbf853e78efdada52ebdc8e958564f14
---