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

indeo5: Fix crash due to partially initialized gop vars. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-28 20:13:00 +01:00
parent 4b35ee0b7c
commit d46bc4133c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/indeo5.c
View File

@ -90,7 +90,7 @@ typedef struct {
*/ */
static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx) static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx)
{ {
int result, i, p, tile_size, pic_size_indx, mb_size, blk_size; int result, i, p, tile_size, pic_size_indx, mb_size, blk_size, is_scalable;
int quant_mat, blk_size_changed = 0; int quant_mat, blk_size_changed = 0;
IVIBandDesc *band, *band1, *band2; IVIBandDesc *band, *band1, *band2;
IVIPicConfig pic_conf; IVIPicConfig pic_conf;
@ -112,8 +112,8 @@ static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx)
/* num_levels * 3 + 1 */ /* num_levels * 3 + 1 */
pic_conf.luma_bands = get_bits(&ctx->gb, 2) * 3 + 1; pic_conf.luma_bands = get_bits(&ctx->gb, 2) * 3 + 1;
pic_conf.chroma_bands = get_bits1(&ctx->gb) * 3 + 1; pic_conf.chroma_bands = get_bits1(&ctx->gb) * 3 + 1;
ctx->is_scalable = pic_conf.luma_bands != 1 || pic_conf.chroma_bands != 1; is_scalable = pic_conf.luma_bands != 1 || pic_conf.chroma_bands != 1;
if (ctx->is_scalable && (pic_conf.luma_bands != 4 || pic_conf.chroma_bands != 1)) { if (is_scalable && (pic_conf.luma_bands != 4 || pic_conf.chroma_bands != 1)) {
av_log(avctx, AV_LOG_ERROR, "Scalability: unsupported subdivision! Luma bands: %d, chroma bands: %d\n", av_log(avctx, AV_LOG_ERROR, "Scalability: unsupported subdivision! Luma bands: %d, chroma bands: %d\n",
pic_conf.luma_bands, pic_conf.chroma_bands); pic_conf.luma_bands, pic_conf.chroma_bands);
return -1; return -1;
@ -151,6 +151,7 @@ static int decode_gop_header(IVI5DecContext *ctx, AVCodecContext *avctx)
return -1; return -1;
} }
ctx->pic_conf = pic_conf; ctx->pic_conf = pic_conf;
ctx->is_scalable = is_scalable;
blk_size_changed = 1; /* force reallocation of the internal structures */ blk_size_changed = 1; /* force reallocation of the internal structures */
} }