comparison 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
comparison
equal deleted inserted replaced
8595:2f476018b4ac 8596:68e959302527
47 int ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr); 47 int ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr);
48 int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block, 48 int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
49 int n, int coded, const uint8_t *scan_table); 49 int n, int coded, const uint8_t *scan_table);
50 int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); 50 int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
51 51
52 #define ENABLE_MSMPEG4_DECODER (ENABLE_MSMPEG4V1_DECODER || \ 52 #define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \
53 ENABLE_MSMPEG4V2_DECODER || \ 53 CONFIG_MSMPEG4V2_DECODER || \
54 ENABLE_MSMPEG4V3_DECODER || \ 54 CONFIG_MSMPEG4V3_DECODER || \
55 ENABLE_WMV2_DECODER || \ 55 CONFIG_WMV2_DECODER || \
56 ENABLE_VC1_DECODER || \ 56 CONFIG_VC1_DECODER || \
57 ENABLE_WMV3_DECODER) 57 CONFIG_WMV3_DECODER)
58 #define ENABLE_MSMPEG4_ENCODER (ENABLE_MSMPEG4V1_ENCODER || \ 58 #define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \
59 ENABLE_MSMPEG4V2_ENCODER || \ 59 CONFIG_MSMPEG4V2_ENCODER || \
60 ENABLE_MSMPEG4V3_ENCODER || \ 60 CONFIG_MSMPEG4V3_ENCODER || \
61 ENABLE_WMV2_ENCODER) 61 CONFIG_WMV2_ENCODER)
62 #define ENABLE_MSMPEG4 (ENABLE_MSMPEG4_DECODER || ENABLE_MSMPEG4_ENCODER) 62 #define CONFIG_MSMPEG4 (CONFIG_MSMPEG4_DECODER || CONFIG_MSMPEG4_ENCODER)
63 #define ENABLE_WMV2 (ENABLE_WMV2_DECODER || ENABLE_WMV2_ENCODER) 63 #define CONFIG_WMV2 (CONFIG_WMV2_DECODER || CONFIG_WMV2_ENCODER)
64 #define ENABLE_WMV_DECODER (ENABLE_WMV1_DECODER || ENABLE_WMV2_DECODER) 64 #define CONFIG_WMV_DECODER (CONFIG_WMV1_DECODER || CONFIG_WMV2_DECODER)
65 #define ENABLE_WMV_ENCODER (ENABLE_WMV1_ENCODER || ENABLE_WMV2_ENCODER) 65 #define CONFIG_WMV_ENCODER (CONFIG_WMV1_ENCODER || CONFIG_WMV2_ENCODER)
66 66
67 #endif /* AVCODEC_MSMPEG4_H */ 67 #endif /* AVCODEC_MSMPEG4_H */