har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/cavsdec: Use ff_set_dimensions()

Browse Source 
Fixes CID1239111 part2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-14 18:08:33 +02:00
parent c5c06e392b
commit f6b8b96607
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/cavsdec.c
View File

@ -1123,6 +1123,7 @@ static int decode_seq_header(AVSContext *h)
{ {
int frame_rate_code; int frame_rate_code;
int width, height; int width, height;
int ret;
h->profile = get_bits(&h->gb, 8); h->profile = get_bits(&h->gb, 8);
h->level = get_bits(&h->gb, 8); h->level = get_bits(&h->gb, 8);
@ -1139,9 +1140,6 @@ static int decode_seq_header(AVSContext *h)
av_log(h->avctx, AV_LOG_ERROR, "Dimensions invalid\n"); av_log(h->avctx, AV_LOG_ERROR, "Dimensions invalid\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
h->width = width;
h->height = height;
skip_bits(&h->gb, 2); //chroma format skip_bits(&h->gb, 2); //chroma format
skip_bits(&h->gb, 3); //sample_precision skip_bits(&h->gb, 3); //sample_precision
h->aspect_ratio = get_bits(&h->gb, 4); h->aspect_ratio = get_bits(&h->gb, 4);
@ -1156,11 +1154,16 @@ static int decode_seq_header(AVSContext *h)
skip_bits1(&h->gb); //marker_bit skip_bits1(&h->gb); //marker_bit
skip_bits(&h->gb, 12); //bit_rate_upper skip_bits(&h->gb, 12); //bit_rate_upper
h->low_delay = get_bits1(&h->gb); h->low_delay = get_bits1(&h->gb);
ret = ff_set_dimensions(h->avctx, width, height);
if (ret < 0)
return ret;
h->width = width;
h->height = height;
h->mb_width = (h->width + 15) >> 4; h->mb_width = (h->width + 15) >> 4;
h->mb_height = (h->height + 15) >> 4; h->mb_height = (h->height + 15) >> 4;
h->avctx->framerate = ff_mpeg12_frame_rate_tab[frame_rate_code]; h->avctx->framerate = ff_mpeg12_frame_rate_tab[frame_rate_code];
h->avctx->width = h->width;
h->avctx->height = h->height;
if (!h->top_qp) if (!h->top_qp)
return ff_cavs_init_top_lines(h); return ff_cavs_init_top_lines(h);
return 0; return 0;