diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:19:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:20:13 +0200 |
| commit | 2070149cbbf853e78efdada52ebdc8e958564f14 (patch) | |
| tree | 6fc31251154d733b89bfc5fb4d90ccc38a3672c0 | |
| parent | 3cc8285439ddb6d8b7eb108cdb7dc793a75e1dbd (diff) | |
| parent | cb5324200ccdc693dd5b28dcd7d4b722fad83ea2 (diff) | |
| download | ffmpeg-2070149cbbf853e78efdada52ebdc8e958564f14.tar.gz | |
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@gmx.at>
| -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 f5a5b86145..604774addb 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); } |