wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'c265b8bb76'

Browse source 
* commit 'c265b8bb76':
  tiff: stop using deprecated avcodec_set_dimensions
  targa: stop using deprecated avcodec_set_dimensions
  svq1dec: stop using deprecated avcodec_set_dimensions
  sunrast: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/sunrast.c
	libavcodec/targa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-01 15:43:29 +01:00
commit ffd100b111
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/tiff.c
View file

@ -546,9 +546,9 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
return AVERROR_INVALIDDATA;
}
if (s->width != s->avctx->width || s->height != s->avctx->height) {
if ((ret = av_image_check_size(s->width, s->height, 0, s->avctx)) < 0)
ret = ff_set_dimensions(s->avctx, s->width, s->height);
if (ret < 0)
return ret;
avcodec_set_dimensions(s->avctx, s->width, s->height);
}
if ((ret = ff_thread_get_buffer(s->avctx, frame, 0)) < 0)
return ret;