Merge commit 'cb5324200ccdc693dd5b28dcd7d4b722fad83ea2' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:19:35 +0000 (21:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:20:13 +0000 (21:20 +0200)
* commit 'cb5324200ccdc693dd5b28dcd7d4b722fad83ea2':
  alac: Reject rice_limit 0 if compression is used

Conflicts:
libavcodec/alac.c

See: 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/alac.c

Simple merge