generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpeg12dec: stop using deprecated avcodec_set_dimensions

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

6
libavcodec/mpeg12dec.c
View File

@ -1141,6 +1141,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
Mpeg1Context *s1 = avctx->priv_data; Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx; MpegEncContext *s = &s1->mpeg_enc_ctx;
uint8_t old_permutation[64]; uint8_t old_permutation[64];
int ret;
if ((s1->mpeg_enc_ctx_allocated == 0) || if ((s1->mpeg_enc_ctx_allocated == 0) ||
avctx->coded_width != s->width || avctx->coded_width != s->width ||
@ -1162,7 +1163,10 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
if ((s->width == 0) || (s->height == 0)) if ((s->width == 0) || (s->height == 0))
return -2; return -2;
avcodec_set_dimensions(avctx, s->width, s->height); ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
return ret;
avctx->bit_rate = s->bit_rate; avctx->bit_rate = s->bit_rate;
s1->save_aspect_info = s->aspect_ratio_info; s1->save_aspect_info = s->aspect_ratio_info;
s1->save_width = s->width; s1->save_width = s->width;