summaryrefslogtreecommitdiff
path: root/libavcodec/vp3.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-07-06 09:35:00 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-07-06 09:35:00 +0000
commit7cda8150442affde146d8bb5a6f7da0d7885a8da (patch)
tree8c02205ea157725b3cd0c6b3e01e56f1aacc35bb /libavcodec/vp3.c
parentc4b7b8bf9c9501aa8adfddc405dd8aab25498868 (diff)
100l, theora_decode_init must pass on errors from vp3_decode_init
Originally committed as revision 19356 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp3.c')
-rw-r--r--libavcodec/vp3.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 3f45428dd6..27ea190a71 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 = {