ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'

Browse Source 
* commit '3b086317277e3f3b61c0343930d8e2570b278bd6':
  h26[13]dec: stop using deprecated avcodec_set_dimensions
  gifdec: stop using deprecated avcodec_set_dimensions
  g2meet: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/gifdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-01 14:50:02 +01:00
commit e6b9d71ad9
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/g2meet.c
View File

@ -701,7 +701,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
goto header_fail;
}
if (c->width != avctx->width || c->height != avctx->height)
avcodec_set_dimensions(avctx, c->width, c->height);
ff_set_dimensions(avctx, c->width, c->height);
c->compression = bytestream2_get_be32(&bc);
if (c->compression != 2 && c->compression != 3) {
av_log(avctx, AV_LOG_ERROR,

3
libavcodec/gifdec.c
View File

@ -463,9 +463,8 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, A
if ((ret = gif_read_header1(s)) < 0)
return ret;
if ((ret = av_image_check_size(s->screen_width, s->screen_height, 0, avctx)) < 0)
if ((ret = ff_set_dimensions(avctx, s->screen_width, s->screen_height)) < 0)
return ret;
avcodec_set_dimensions(avctx, s->screen_width, s->screen_height);
av_frame_unref(s->frame);
if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0)

5
libavcodec/h261dec.c
View File

@ -30,6 +30,7 @@
#include "mpegvideo.h"
#include "h263.h"
#include "h261.h"
#include "internal.h"
#define H261_MBA_VLC_BITS 9
#define H261_MTYPE_VLC_BITS 6
@ -609,7 +610,9 @@ retry:
s->parse_context = pc;
}
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;
}

4
libavcodec/h263dec.c
View File

@ -630,7 +630,9 @@ retry:
/* H.263 could change picture size any time */
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)))
return ret;