diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-29 09:54:49 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-29 09:54:49 +0000 |
| commit | 9be6f0d2f8393100a11c8527c7ba18c1dc2f1450 (patch) | |
| tree | cbcc3b2049b5c4b48ba3d8919d532f68fc0cfafb /libavcodec/msmpeg4.h | |
| parent | e0f58e39c45abf4fd830f745d31acc43183ac7e6 (diff) | |
| download | ffmpeg-9be6f0d2f8393100a11c8527c7ba18c1dc2f1450.tar.gz | |
Do not check for both CONFIG_VC1_DECODER and CONFIG_WMV3_DECODER,
the former depends upon the latter.
Originally committed as revision 19533 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/msmpeg4.h')
| -rw-r--r-- | libavcodec/msmpeg4.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index 4a62698c6a..278ed15ee1 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -53,8 +53,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); CONFIG_MSMPEG4V2_DECODER || \ CONFIG_MSMPEG4V3_DECODER || \ CONFIG_WMV2_DECODER || \ - CONFIG_VC1_DECODER || \ - CONFIG_WMV3_DECODER) + CONFIG_VC1_DECODER) #define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V1_ENCODER || \ CONFIG_MSMPEG4V2_ENCODER || \ CONFIG_MSMPEG4V3_ENCODER || \ |