generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'

Browse Source 
* commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745':
  shorten: check for return value

Conflicts:
	libavcodec/shorten.c

See: e20ebe491c17388a312e04ff060c217ecfafc914
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-13 14:21:58 +01:00
commit ecb748866e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/shorten.c
View File

@ -510,7 +510,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
if (bitshift > 31) { if (bitshift > 31) {
av_log(avctx, AV_LOG_ERROR, "bitshift %d is invalid\n", av_log(avctx, AV_LOG_ERROR, "bitshift %d is invalid\n",
bitshift); bitshift);
return AVERROR_PATCHWELCOME; return AVERROR_INVALIDDATA;
} }
s->bitshift = bitshift; s->bitshift = bitshift;
break; break;