diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 23:00:02 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 23:00:40 +0300 |
commit | ce1c0e99e9f66616bcbdbc2de8ca077bdfa03aa7 (patch) | |
tree | f98e03798d7884acbc4ea935943f35332fa9a8d4 /libavcodec/alac.c | |
parent | 918c5ea4d3702a9eebf4794e75507c4d5bc9cba2 (diff) | |
parent | 243e8443cd9e83c887e3f5edf09a169e7783d14e (diff) |
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>
Diffstat (limited to 'libavcodec/alac.c')
-rw-r--r-- | libavcodec/alac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index ada7c73c55..b0527f1439 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -317,7 +317,8 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index, int rice_history_mult[2]; if (!alac->rice_limit) { - avpriv_request_sample(alac->avctx, "Compression with rice limit 0"); + avpriv_request_sample(alac->avctx, + "Compression with rice limit 0"); return AVERROR(ENOSYS); } |