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

h26[13]dec: stop using deprecated avcodec_set_dimensions

Browse Source
This commit is contained in:
Anton Khirnov 2013-10-27 10:02:26 +01:00
parent 8255535c5f
commit 3b08631727
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h261dec.c
View File

@ -29,6 +29,7 @@
#include "mpegvideo.h" #include "mpegvideo.h"
#include "h263.h" #include "h263.h"
#include "h261.h" #include "h261.h"
#include "internal.h"
#define H261_MBA_VLC_BITS 9 #define H261_MBA_VLC_BITS 9
#define H261_MTYPE_VLC_BITS 6 #define H261_MTYPE_VLC_BITS 6
@ -607,7 +608,9 @@ retry:
s->parse_context = pc; s->parse_context = pc;
} }
if (!s->context_initialized) { if (!s->context_initialized) {
avcodec_set_dimensions(avctx, s->width, s->height); ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
return ret;
goto retry; goto retry;
} }

4
libavcodec/h263dec.c
View File

@ -600,7 +600,9 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
/* H.263 could change picture size any time */ /* H.263 could change picture size any time */
s->context_reinit = 0; s->context_reinit = 0;
avcodec_set_dimensions(avctx, s->width, s->height); ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
return ret;
if ((ret = ff_MPV_common_frame_size_change(s))) if ((ret = ff_MPV_common_frame_size_change(s)))
return ret; return ret;