[FFmpeg-cvslog] r20971 - in trunk/libavcodec: mpegvideo.c mpegvideo_common.h msmpeg4.h

[diego]

Author: diego
Date: Wed Dec 30 03:08:25 2009
New Revision: 20971

Log:
Get rid of pointless CONFIG_WMV2 definition.

Modified:
   trunk/libavcodec/mpegvideo.c
   trunk/libavcodec/mpegvideo_common.h
   trunk/libavcodec/msmpeg4.h

Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	Wed Dec 30 03:01:19 2009	(r20970)
+++ trunk/libavcodec/mpegvideo.c	Wed Dec 30 03:08:25 2009	(r20971)
@@ -1966,7 +1966,7 @@ void MPV_decode_mb_internal(MpegEncConte
                     }
                 }//fi gray
             }
-            else if (CONFIG_WMV2) {
+            else if (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) {
                 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr);
             }
         } else {

Modified: trunk/libavcodec/mpegvideo_common.h
==============================================================================
--- trunk/libavcodec/mpegvideo_common.h	Wed Dec 30 03:01:19 2009	(r20970)
+++ trunk/libavcodec/mpegvideo_common.h	Wed Dec 30 03:08:25 2009	(r20971)
@@ -727,7 +727,7 @@ static av_always_inline void MPV_motion_
                         0, 0, 0,
                         ref_picture, pix_op, qpix_op,
                         s->mv[dir][0][0], s->mv[dir][0][1], 16);
-        }else if(!is_mpeg12 && CONFIG_WMV2 && s->mspel){
+        }else if(!is_mpeg12 && (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) && s->mspel){
             ff_mspel_motion(s, dest_y, dest_cb, dest_cr,
                         ref_picture, pix_op,
                         s->mv[dir][0][0], s->mv[dir][0][1], 16);

Modified: trunk/libavcodec/msmpeg4.h
==============================================================================
--- trunk/libavcodec/msmpeg4.h	Wed Dec 30 03:01:19 2009	(r20970)
+++ trunk/libavcodec/msmpeg4.h	Wed Dec 30 03:08:25 2009	(r20971)
@@ -58,7 +58,6 @@ int ff_wmv2_decode_mb(MpegEncContext *s,
                                 CONFIG_MSMPEG4V2_ENCODER || \
                                 CONFIG_MSMPEG4V3_ENCODER || \
                                 CONFIG_WMV2_ENCODER)
-#define CONFIG_WMV2 (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER)
 #define CONFIG_WMV_DECODER (CONFIG_WMV1_DECODER || CONFIG_WMV2_DECODER)
 
 #endif /* AVCODEC_MSMPEG4_H */