diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
| commit | f7813a5324be39d13ab536c245d15dfc602a7849 (patch) | |
| tree | fad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavcodec/vp5.c | |
| parent | b7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff) | |
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavcodec/vp5.c')
| -rw-r--r-- | ffmpeg/libavcodec/vp5.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ffmpeg/libavcodec/vp5.c b/ffmpeg/libavcodec/vp5.c index 4eecbe3..756dc92 100644 --- a/ffmpeg/libavcodec/vp5.c +++ b/ffmpeg/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) @@ -280,6 +283,7 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx) AVCodec ff_vp5_decoder = { .name = "vp5", + .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP5, .priv_data_size = sizeof(VP56Context), @@ -287,5 +291,4 @@ AVCodec ff_vp5_decoder = { .close = ff_vp56_free, .decode = ff_vp56_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), }; |