oggparsevorbis: Add some sanity checks to header packet ordering/presence.

[ffmpeg] / libavcodec / msmpeg4.h

diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index cc34f0a1995a4e37c7e959be46a5849c804c0bd5..28372a0bc8d56362123c74894e6ddb19a75b0023 100644 (file)
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file msmpeg4.h
+ * @file
  */
 
 #ifndef AVCODEC_MSMPEG4_H
@@ -53,15 +53,10 @@ 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 || \
                                 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 */