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/asvdec.c | |
| parent | b7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff) | |
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavcodec/asvdec.c')
| -rw-r--r-- | ffmpeg/libavcodec/asvdec.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ffmpeg/libavcodec/asvdec.c b/ffmpeg/libavcodec/asvdec.c index 7dca22b..038b461 100644 --- a/ffmpeg/libavcodec/asvdec.c +++ b/ffmpeg/libavcodec/asvdec.c @@ -28,7 +28,6 @@ #include "asv.h" #include "avcodec.h" -#include "put_bits.h" #include "internal.h" #include "mathops.h" #include "mpeg12data.h" @@ -272,6 +271,10 @@ static av_cold int decode_init(AVCodecContext *avctx) const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2; int i; + if (avctx->extradata_size < 1) { + av_log(avctx, AV_LOG_WARNING, "No extradata provided\n"); + } + ff_asv_common_init(avctx); init_vlcs(a); ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_asv_scantab); @@ -307,6 +310,7 @@ static av_cold int decode_end(AVCodecContext *avctx) #if CONFIG_ASV1_DECODER AVCodec ff_asv1_decoder = { .name = "asv1", + .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ASV1, .priv_data_size = sizeof(ASV1Context), @@ -314,13 +318,13 @@ AVCodec ff_asv1_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ASUS V1"), }; #endif #if CONFIG_ASV2_DECODER AVCodec ff_asv2_decoder = { .name = "asv2", + .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_ASV2, .priv_data_size = sizeof(ASV1Context), @@ -328,7 +332,6 @@ AVCodec ff_asv2_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("ASUS V2"), }; #endif |