diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:34:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:34:49 +0100 |
| commit | 7630e564caaef008ae255c3b63ac725131073b6f (patch) | |
| tree | 28d00107374434d841637f6a299446d1e7122f72 /libavcodec/rv34.c | |
| parent | a897ba33e88316d2591a89ab93f8f69587d245ca (diff) | |
| parent | c755870d52c8c29676e5ba7ee9557adf4a7ca934 (diff) | |
| download | ffmpeg-7630e564caaef008ae255c3b63ac725131073b6f.tar.gz | |
Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'
* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
sgidec: stop using deprecated avcodec_set_dimensions
rv34: stop using deprecated avcodec_set_dimensions
rv10: stop using deprecated avcodec_set_dimensions
ptx: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/ptx.c
libavcodec/rv10.c
libavcodec/sgidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index f84fb005df..4896b39a8c 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1693,7 +1693,11 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, si.width, si.height); s->width = si.width; s->height = si.height; - avcodec_set_dimensions(s->avctx, s->width, s->height); + + err = ff_set_dimensions(s->avctx, s->width, s->height); + if (err < 0) + return err; + if ((err = ff_MPV_common_frame_size_change(s)) < 0) return err; if ((err = rv34_decoder_realloc(r)) < 0) |