projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
41ad353
)
pictordec: 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/pictordec.c
patch
|
blob
|
history
diff --git
a/libavcodec/pictordec.c
b/libavcodec/pictordec.c
index
2d72977
..
33c4545
100644
(file)
--- a/
libavcodec/pictordec.c
+++ b/
libavcodec/pictordec.c
@@
-141,9
+141,9
@@
static int decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = AV_PIX_FMT_PAL8;
if (s->width != avctx->width && s->height != avctx->height) {
- if (av_image_check_size(s->width, s->height, 0, avctx) < 0)
- return -1;
-
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_get_buffer(avctx, frame, 0)) < 0) {