virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mpegvideo_parser: stop using deprecated avcodec_set_dimensions

Browse Source
This commit is contained in:
Anton Khirnov 2013-10-27 10:02:26 +01:00
parent 13207484bb
commit 6da9c9d381
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegvideo_parser.c
View File

@ -62,7 +62,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
pc->width = (buf[0] << 4) | (buf[1] >> 4); pc->width = (buf[0] << 4) | (buf[1] >> 4);
pc->height = ((buf[1] & 0x0f) << 8) | buf[2]; pc->height = ((buf[1] & 0x0f) << 8) | buf[2];
if(!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height){ if(!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height){
avcodec_set_dimensions(avctx, pc->width, pc->height); ff_set_dimensions(avctx, pc->width, pc->height);
did_set_size=1; did_set_size=1;
} }
frame_rate_index = buf[3] & 0xf; frame_rate_index = buf[3] & 0xf;
@ -90,7 +90,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s,
pc->height |=( vert_size_ext << 12); pc->height |=( vert_size_ext << 12);
avctx->bit_rate += (bit_rate_ext << 18) * 400; avctx->bit_rate += (bit_rate_ext << 18) * 400;
if(did_set_size) if(did_set_size)
avcodec_set_dimensions(avctx, pc->width, pc->height); ff_set_dimensions(avctx, pc->width, pc->height);
avctx->time_base.den = pc->frame_rate.den * (frame_rate_ext_n + 1) * 2; avctx->time_base.den = pc->frame_rate.den * (frame_rate_ext_n + 1) * 2;
avctx->time_base.num = pc->frame_rate.num * (frame_rate_ext_d + 1); avctx->time_base.num = pc->frame_rate.num * (frame_rate_ext_d + 1);
avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO; avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;