diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:49:58 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:49:58 +0400 |
commit | 98ca3fb9cf7fdfad38e731ffb029fa3f96b94581 (patch) | |
tree | f1cec553a2ad4be7135cc63adc061bc234f38c64 /libavcodec/txd.c | |
parent | ffd100b111f4d494a9d70dae0efef0307eaf84d8 (diff) | |
parent | 757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be (diff) |
Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'
* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be':
vp8: stop using deprecated avcodec_set_dimensions
vp56: stop using deprecated avcodec_set_dimensions
vp3: stop using deprecated avcodec_set_dimensions
txd: stop using deprecated avcodec_set_dimensions
truemotion1: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/txd.c
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/txd.c')
-rw-r--r-- | libavcodec/txd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/txd.c b/libavcodec/txd.c index 7526f1377c..ad1a0152f4 100644 --- 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) return ret; |