git.videolan.org
/
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:
db92e4e
)
txd: 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/txd.c
patch
|
blob
|
history
diff --git
a/libavcodec/txd.c
b/libavcodec/txd.c
index
0eca07f
..
8f12291
100644
(file)
--- a/
libavcodec/txd.c
+++ b/
libavcodec/txd.c
@@
-63,10
+63,9
@@
static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_PATCHWELCOME;
}
- if ((ret =
av_image_check_size(w, h, 0, avctx
)) < 0)
+ if ((ret =
ff_set_dimensions(avctx, w, h
)) < 0)
return ret;
- if (w != avctx->width || h != avctx->height)
- avcodec_set_dimensions(avctx, w, h);
+
if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;