[SCM] libav/experimental: 100l, theora_decode_init must pass on errors from vp3_decode_init

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:48:38 UTC 2013


The following commit has been merged in the experimental branch:
commit 7cda8150442affde146d8bb5a6f7da0d7885a8da
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Mon Jul 6 09:35:00 2009 +0000

    100l, theora_decode_init must pass on errors from vp3_decode_init
    
    Originally committed as revision 19356 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 3f45428..27ea190 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2291,6 +2291,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
     uint8_t *header_start[3];
     int header_len[3];
     int i;
+    int ret;
 
     s->theora = 1;
 
@@ -2343,8 +2344,8 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
         break;
   }
 
-    vp3_decode_init(avctx);
-    return 0;
+    ret = vp3_decode_init(avctx);
+    return ret;
 }
 
 AVCodec theora_decoder = {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list