[FFmpeg-cvslog] r20972 - in trunk/libavcodec: h263.h msmpeg4.h

[diego]

Author: diego
Date: Wed Dec 30 03:09:51 2009
New Revision: 20972

Log:
Get rid of pointless CONFIG_WMV_DECODER definition.

Modified:
   trunk/libavcodec/h263.h
   trunk/libavcodec/msmpeg4.h

Modified: trunk/libavcodec/h263.h
==============================================================================
--- trunk/libavcodec/h263.h	Wed Dec 30 03:08:25 2009	(r20971)
+++ trunk/libavcodec/h263.h	Wed Dec 30 03:09:51 2009	(r20972)
@@ -27,7 +27,8 @@
 
 #define CONFIG_ANY_H263_DECODER (CONFIG_H263_DECODER    || \
                                  CONFIG_MSMPEG4_DECODER || \
-                                 CONFIG_WMV_DECODER)
+                                 CONFIG_WMV1_DECODER    || \
+                                 CONFIG_WMV2_DECODER)
 #define CONFIG_ANY_H263 (CONFIG_ANY_H263_DECODER || CONFIG_H263_ENCODER)
 
 #endif /* AVCODEC_H263_H */

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