Mercurial > libavcodec.hg
comparison msmpeg4.h @ 9995:3141f69e3905 libavcodec
Do not check for both CONFIG_VC1_DECODER and CONFIG_WMV3_DECODER,
the former depends upon the latter.
author | diego |
---|---|
date | Wed, 29 Jul 2009 09:54:49 +0000 |
parents | e9d9d946f213 |
children | 157e3c5a48bd |
comparison
equal
deleted
inserted
replaced
9994:cd2b3ecdb1c9 | 9995:3141f69e3905 |
---|---|
51 | 51 |
52 #define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \ | 52 #define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \ |
53 CONFIG_MSMPEG4V2_DECODER || \ | 53 CONFIG_MSMPEG4V2_DECODER || \ |
54 CONFIG_MSMPEG4V3_DECODER || \ | 54 CONFIG_MSMPEG4V3_DECODER || \ |
55 CONFIG_WMV2_DECODER || \ | 55 CONFIG_WMV2_DECODER || \ |
56 CONFIG_VC1_DECODER || \ | 56 CONFIG_VC1_DECODER) |
57 CONFIG_WMV3_DECODER) | |
58 #define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \ | 57 #define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \ |
59 CONFIG_MSMPEG4V2_ENCODER || \ | 58 CONFIG_MSMPEG4V2_ENCODER || \ |
60 CONFIG_MSMPEG4V3_ENCODER || \ | 59 CONFIG_MSMPEG4V3_ENCODER || \ |
61 CONFIG_WMV2_ENCODER) | 60 CONFIG_WMV2_ENCODER) |
62 #define CONFIG_MSMPEG4 (CONFIG_MSMPEG4_DECODER || CONFIG_MSMPEG4_ENCODER) | 61 #define CONFIG_MSMPEG4 (CONFIG_MSMPEG4_DECODER || CONFIG_MSMPEG4_ENCODER) |