Move AVMediaType from libavcodec to libavutil.

[ffmpeg] / libavcodec / wmv2enc.c

diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
index c7b8899f61df4d0ff27ee6517e01ce7ee599ba50..7416f852336167dad0c5595475c825b5bf0c7144 100644 (file)
--- a/libavcodec/wmv2enc.c
+++ b/libavcodec/wmv2enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002 The FFmpeg Project.
+ * Copyright (c) 2002 The FFmpeg Project
  *
  * This file is part of FFmpeg.
  *
@@ -23,6 +23,7 @@
 #include "mpegvideo.h"
 #include "msmpeg4.h"
 #include "msmpeg4data.h"
+#include "h263.h"
 #include "wmv2.h"
 
 
@@ -66,19 +67,6 @@ static av_cold int wmv2_encode_init(AVCodecContext *avctx){
     return 0;
 }
 
-#if 0 /* unused, remove? */
-static av_cold int wmv2_encode_end(AVCodecContext *avctx){
-
-    if(MPV_encode_end(avctx) < 0)
-        return -1;
-
-    avctx->extradata_size= 0;
-    av_freep(&avctx->extradata);
-
-    return 0;
-}
-#endif
-
 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
 {
     Wmv2Context * const w= (Wmv2Context*)s;
@@ -91,7 +79,6 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
 
     s->dc_table_index = 1;
     s->mv_table_index = 1; /* only if P frame */
-//    s->use_skip_mb_code = 1; /* only if P frame */
     s->per_mb_rl_table = 0;
     s->mspel= 0;
     w->per_mb_abt=0;
@@ -203,10 +190,6 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
             }
             coded_cbp |= val << (5 - i);
         }
-#if 0
-        if (coded_cbp)
-            printf("cbp=%x %x\n", cbp, coded_cbp);
-#endif
 
         if (s->pict_type == FF_I_TYPE) {
             put_bits(&s->pb,
@@ -230,12 +213,12 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
 
 AVCodec wmv2_encoder = {
     "wmv2",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_WMV2,
     sizeof(Wmv2Context),
     wmv2_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
-    .long_name= "Windows Media Video 8",
+    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+    .long_name= NULL_IF_CONFIG_SMALL("Windows Media Video 8"),
 };