100l, theora_decode_init must pass on errors from vp3_decode_init
Originally committed as revision 19356 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@@ -2291,6 +2291,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
|
|||||||
uint8_t *header_start[3];
|
uint8_t *header_start[3];
|
||||||
int header_len[3];
|
int header_len[3];
|
||||||
int i;
|
int i;
|
||||||
|
int ret;
|
||||||
|
|
||||||
s->theora = 1;
|
s->theora = 1;
|
||||||
|
|
||||||
@@ -2343,8 +2344,8 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
vp3_decode_init(avctx);
|
ret = vp3_decode_init(avctx);
|
||||||
return 0;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
AVCodec theora_decoder = {
|
AVCodec theora_decoder = {
|
||||||
|
Reference in New Issue
Block a user