diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:43:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:43:29 +0100 |
| commit | ffd100b111f4d494a9d70dae0efef0307eaf84d8 (patch) | |
| tree | ea85fc5a2a9976982f18bd26b3d96ff352a402c6 /libavcodec/tiff.c | |
| parent | 7630e564caaef008ae255c3b63ac725131073b6f (diff) | |
| parent | c265b8bb7638546919465e3585441b1d40c4b13d (diff) | |
Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'
* commit 'c265b8bb7638546919465e3585441b1d40c4b13d':
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>
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 2b100ede5e..cd209674ca 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -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; |