mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'
* commit '243e8443cd9e83c887e3f5edf09a169e7783d14e':
alac: Reject rice_limit 0 if compression is used
Conflicts:
libavcodec/alac.c
See: 4b657a1b1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ce1c0e99e9
|
@ -317,7 +317,8 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index,
|
||||||
int rice_history_mult[2];
|
int rice_history_mult[2];
|
||||||
|
|
||||||
if (!alac->rice_limit) {
|
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);
|
return AVERROR(ENOSYS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue