Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:00:02 +0000 (22:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:00:40 +0000 (22:00 +0200)
commitce1c0e99e9f66616bcbdbc2de8ca077bdfa03aa7
treef98e03798d7884acbc4ea935943f35332fa9a8d4
parent918c5ea4d3702a9eebf4794e75507c4d5bc9cba2
parent243e8443cd9e83c887e3f5edf09a169e7783d14e
Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'

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

Conflicts:
libavcodec/alac.c

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