RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '711c970168297683860422e95d6b7e37ee3c8367' 

* commit '711c970168297683860422e95d6b7e37ee3c8367':
  rv34: Check the return value from ff_rv34_decode_init

Conflicts:
	libavcodec/rv30.c
	libavcodec/rv40.c

See: b86651a208
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-17 15:37:04 +02:00
parent 2c8d876dea 711c970168
commit b3dfda8a41
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/rv30.c
View File

@ -251,8 +251,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx)
int ret;
r->rv30 = 1;
ret = ff_rv34_decode_init(avctx);
if (ret < 0)
if ((ret = ff_rv34_decode_init(avctx)) < 0)
return ret;
if(avctx->extradata_size < 2){
av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n");

3
libavcodec/rv40.c
View File

@ -550,8 +550,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx)
int ret;
r->rv30 = 0;
ret = ff_rv34_decode_init(avctx);
if (ret < 0)
if ((ret = ff_rv34_decode_init(avctx)) < 0)
return ret;
if(!aic_top_vlc.bits)
rv40_init_tables();