diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:49:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:49:58 +0100 |
| commit | 98ca3fb9cf7fdfad38e731ffb029fa3f96b94581 (patch) | |
| tree | f1cec553a2ad4be7135cc63adc061bc234f38c64 /libavcodec/vp5.c | |
| parent | ffd100b111f4d494a9d70dae0efef0307eaf84d8 (diff) | |
| parent | 757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be (diff) | |
| download | ffmpeg-98ca3fb9cf7fdfad38e731ffb029fa3f96b94581.tar.gz | |
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/vp5.c')
| -rw-r--r-- | libavcodec/vp5.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 2ab90b7b5b..756dc9270c 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "get_bits.h" +#include "internal.h" #include "vp56.h" #include "vp56data.h" @@ -66,7 +67,9 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) if (!s->macroblocks || /* first frame */ 16*cols != s->avctx->coded_width || 16*rows != s->avctx->coded_height) { - avcodec_set_dimensions(s->avctx, 16*cols, 16*rows); + int ret = ff_set_dimensions(s->avctx, 16 * cols, 16 * rows); + if (ret < 0) + return ret; return VP56_SIZE_CHANGE; } } else if (!s->macroblocks) |