diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:09:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:09:17 +0100 |
| commit | bf688d23b5ff63395e4acf46b5d7fd5e610aab96 (patch) | |
| tree | ee2a25164d980386ac49455a96b0b1aa947955ec /libavcodec/eatqi.c | |
| parent | 4a356512676629b4a289ea33f2b39b5f151cfae3 (diff) | |
| parent | ec7063005ee67c0b4d4b83aa5118dd22ad1094e8 (diff) | |
Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8'
* commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8':
eatqi: stop using deprecated avcodec_set_dimensions
eatgv: stop using deprecated avcodec_set_dimensions
eatgq: stop using deprecated avcodec_set_dimensions
eamad: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eatqi.c')
| -rw-r--r-- | libavcodec/eatqi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 262deb1cdd..387456a933 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -111,8 +111,9 @@ static int tqi_decode_frame(AVCodecContext *avctx, tqi_calculate_qtable(s, buf[4]); buf += 8; - if (s->avctx->width!=s->width || s->avctx->height!=s->height) - avcodec_set_dimensions(s->avctx, s->width, s->height); + ret = ff_set_dimensions(s->avctx, s->width, s->height); + if (ret < 0) + return ret; if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; |