Define AVMediaType enum, and use it instead of enum CodecType, which

[ffmpeg.git] / libavcodec / wmv2dec.c

diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index b14b514..a9bb80c 100644 (file)
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -21,6 +21,7 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"

+#include "h263.h"

 #include "mathops.h"
 #include "msmpeg4.h"
 #include "msmpeg4data.h"
 #include "mathops.h"
 #include "msmpeg4.h"
 #include "msmpeg4data.h"


@@ -465,7 +466,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx){
         avctx->idct_algo=FF_IDCT_WMV2;
     }
 
         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);
         return -1;
 
     ff_wmv2_common_init(w);


@@ -485,7 +486,7 @@ static av_cold int wmv2_decode_end(AVCodecContext *avctx)
 
 AVCodec wmv2_decoder = {
     "wmv2",
 
 AVCodec wmv2_decoder = {
     "wmv2",

-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,

     CODEC_ID_WMV2,
     sizeof(Wmv2Context),
     wmv2_decode_init,
     CODEC_ID_WMV2,
     sizeof(Wmv2Context),
     wmv2_decode_init,