Provide non null class name to avoid crash with ffmpeg -h.

[ffmpeg] / libavcodec / msmpeg4.h

diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index 1cf96632603debfc077c1ae3dd64d8788c67b73b..17288b8e281c3804b87d0a0abc725e0e60ee0fe1 100644 (file)
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -23,10 +23,31 @@
  * @file msmpeg4.h
  */
 
-#ifndef MSMPEG4_H
-#define MSMPEG4_H
+#ifndef FFMPEG_MSMPEG4_H
+#define FFMPEG_MSMPEG4_H
 
 #include "config.h"
+#include "avcodec.h"
+#include "dsputil.h"
+#include "mpegvideo.h"
+
+#define INTER_INTRA_VLC_BITS 3
+#define MB_NON_INTRA_VLC_BITS 9
+#define MB_INTRA_VLC_BITS 9
+
+extern VLC ff_mb_non_intra_vlc[4];
+extern VLC ff_inter_intra_vlc;
+
+void ff_msmpeg4_code012(PutBitContext *pb, int n);
+void ff_msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n);
+void ff_msmpeg4_handle_slices(MpegEncContext *s);
+void ff_msmpeg4_encode_motion(MpegEncContext * s, int mx, int my);
+int ff_msmpeg4_coded_block_pred(MpegEncContext * s, int n,
+                                uint8_t **coded_block_ptr);
+int ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr);
+int ff_msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
+                            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 || \
@@ -38,5 +59,7 @@
                                 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)
 
-#endif /* MSMPEG4_H */
+#endif /* FFMPEG_MSMPEG4_H */