Mercurial > libavcodec.hg
diff msmpeg4.h @ 8596:68e959302527 libavcodec
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
and remove all ENABLE_ definitions.
| author | aurel |
|---|---|
| date | Wed, 14 Jan 2009 17:19:17 +0000 |
| parents | 67b0e60022bf |
| children | e9d9d946f213 |
line wrap: on
line diff
--- a/msmpeg4.h Wed Jan 14 09:26:07 2009 +0000 +++ b/msmpeg4.h Wed Jan 14 17:19:17 2009 +0000 @@ -49,19 +49,19 @@ int n, int coded, const uint8_t *scan_table); int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); -#define ENABLE_MSMPEG4_DECODER (ENABLE_MSMPEG4V1_DECODER || \ - ENABLE_MSMPEG4V2_DECODER || \ - ENABLE_MSMPEG4V3_DECODER || \ - ENABLE_WMV2_DECODER || \ - ENABLE_VC1_DECODER || \ - ENABLE_WMV3_DECODER) -#define ENABLE_MSMPEG4_ENCODER (ENABLE_MSMPEG4V1_ENCODER || \ - ENABLE_MSMPEG4V2_ENCODER || \ - ENABLE_MSMPEG4V3_ENCODER || \ - ENABLE_WMV2_ENCODER) -#define ENABLE_MSMPEG4 (ENABLE_MSMPEG4_DECODER || ENABLE_MSMPEG4_ENCODER) -#define ENABLE_WMV2 (ENABLE_WMV2_DECODER || ENABLE_WMV2_ENCODER) -#define ENABLE_WMV_DECODER (ENABLE_WMV1_DECODER || ENABLE_WMV2_DECODER) -#define ENABLE_WMV_ENCODER (ENABLE_WMV1_ENCODER || ENABLE_WMV2_ENCODER) +#define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \ + CONFIG_MSMPEG4V2_DECODER || \ + CONFIG_MSMPEG4V3_DECODER || \ + CONFIG_WMV2_DECODER || \ + CONFIG_VC1_DECODER || \ + CONFIG_WMV3_DECODER) +#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \ + CONFIG_MSMPEG4V2_ENCODER || \ + CONFIG_MSMPEG4V3_ENCODER || \ + CONFIG_WMV2_ENCODER) +#define CONFIG_MSMPEG4 (CONFIG_MSMPEG4_DECODER || CONFIG_MSMPEG4_ENCODER) +#define CONFIG_WMV2 (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER) +#define CONFIG_WMV_DECODER (CONFIG_WMV1_DECODER || CONFIG_WMV2_DECODER) +#define CONFIG_WMV_ENCODER (CONFIG_WMV1_ENCODER || CONFIG_WMV2_ENCODER) #endif /* AVCODEC_MSMPEG4_H */