Get rid of pointless CONFIG_WMV_DECODER definition.

Originally committed as revision 20972 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index 16aa242..515388b 100644 (file)
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -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 */

diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index c55aa1e..259be2f 100644 (file)
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -58,6 +58,5 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
                                 CONFIG_MSMPEG4V2_ENCODER || \
                                 CONFIG_MSMPEG4V3_ENCODER || \
                                 CONFIG_WMV2_ENCODER)
-#define CONFIG_WMV_DECODER (CONFIG_WMV1_DECODER || CONFIG_WMV2_DECODER)
 
 #endif /* AVCODEC_MSMPEG4_H */