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/vp6.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/vp6.c')
| -rw-r--r-- | libavcodec/vp6.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 4cf11eea7e..f552524db6 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -32,6 +32,7 @@ #include "avcodec.h" #include "get_bits.h" #include "huffman.h" +#include "internal.h" #include "vp56.h" #include "vp56data.h" @@ -92,7 +93,10 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) s->avctx->coded_width = 16 * cols; s->avctx->coded_height = 16 * rows; } else { - 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; + if (s->avctx->extradata_size == 1) { s->avctx->width -= s->avctx->extradata[0] >> 4; s->avctx->height -= s->avctx->extradata[0] & 0x0F; @@ -154,7 +158,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) buf_size -= coeff_offset; if (buf_size < 0) { if (s->frames[VP56_FRAME_CURRENT]->key_frame) - avcodec_set_dimensions(s->avctx, 0, 0); + ff_set_dimensions(s->avctx, 0, 0); return AVERROR_INVALIDDATA; } if (s->use_huffman) { |