virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'

Browse Source 
* 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:
Michael Niedermayer
2015-05-10 22:00:02 +02:00
parent 918c5ea4d3 243e8443cd
commit ce1c0e99e9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/alac.c
View File

@@ -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);
} }