From af8a008a68bf93625acf726e3fc2271669da88f8 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 30 Dec 2009 02:09:51 +0000 Subject: [PATCH] Get rid of pointless CONFIG_WMV_DECODER definition. Originally committed as revision 20972 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h263.h | 3 ++- libavcodec/msmpeg4.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 16aa242abf..515388bd54 100644 --- 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 c55aa1e918..259be2f370 100644 --- 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 */