Merge commit '711c970168297683860422e95d6b7e37ee3c8367'

* commit '711c970168297683860422e95d6b7e37ee3c8367': rv34: Check the return value from ff_rv34_decode_init Conflicts: libavcodec/rv30.c libavcodec/rv40.c See: b86651a Merged-by: Michael Niedermayer <[email protected]>
SaschaVasarrhelyi · Sep 17, 2013 · b3dfda8 · b3dfda8
2 parents 2c8d876 + 711c970
commit b3dfda8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
@@ -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");

diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c
@@ -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();