X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fwmv2dec.c;h=c83f898d7f69029e9581cbb7293e1989f487a3e2;hb=73c44cb2869bfdbea829942eb35efa6d4c4e2f91;hp=e4974387074dbdbd054322b9cd2b5c4e63b31342;hpb=d5202e4fda3d6e3d63e032328b7626f779572e76;p=ffmpeg diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index e4974387074..c83f898d7f6 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002 The FFmpeg Project. + * Copyright (c) 2002 The FFmpeg Project * * This file is part of FFmpeg. * @@ -21,6 +21,8 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" +#include "h263.h" +#include "mathops.h" #include "msmpeg4.h" #include "msmpeg4data.h" #include "intrax8.h" @@ -464,7 +466,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx){ avctx->idct_algo=FF_IDCT_WMV2; } - if(ff_h263_decode_init(avctx) < 0) + if(ff_msmpeg4_decode_init(avctx) < 0) return -1; ff_wmv2_common_init(w); @@ -484,7 +486,7 @@ static av_cold int wmv2_decode_end(AVCodecContext *avctx) AVCodec wmv2_decoder = { "wmv2", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_WMV2, sizeof(Wmv2Context), wmv2_decode_init, @@ -492,5 +494,7 @@ AVCodec wmv2_decoder = { wmv2_decode_end, ff_h263_decode_frame, CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name = "Windows Media Video 8", + .max_lowres = 3, + .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 8"), + .pix_fmts= ff_pixfmt_list_420, };