projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eed5a47
)
tiff: stop using deprecated avcodec_set_dimensions
author
Anton Khirnov
<anton@khirnov.net>
Sun, 27 Oct 2013 09:02:26 +0000
(10:02 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Thu, 31 Oct 2013 19:14:16 +0000
(20:14 +0100)
libavcodec/tiff.c
patch
|
blob
|
history
diff --git
a/libavcodec/tiff.c
b/libavcodec/tiff.c
index
735eafe
..
7fb0e7a
100644
(file)
--- a/
libavcodec/tiff.c
+++ b/
libavcodec/tiff.c
@@
-296,9
+296,9
@@
static int init_image(TiffContext *s, AVFrame *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_get_buffer(s->avctx, frame, 0)) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");