Do not check for both CONFIG_H263_ENCODER and CONFIG_FLV_ENCODER.

[ffmpeg] / libavcodec / mjpeg.h

diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h
index 028f8c0d3f333869c03973ae899032a290198a97..c556cb2366b74cbe1ca69be0a8ea13d492d69362 100644 (file)
--- a/libavcodec/mjpeg.h
+++ b/libavcodec/mjpeg.h
@@ -1,6 +1,6 @@
 /*
  * MJPEG encoder and decoder
- * Copyright (c) 2000, 2001 Fabrice Bellard.
+ * Copyright (c) 2000, 2001 Fabrice Bellard
  * Copyright (c) 2003 Alex Beregszaszi
  * Copyright (c) 2003-2004 Michael Niedermayer
  *
@@ -26,15 +26,15 @@
  */
 
 /**
- * @file mjpeg.h
+ * @file libavcodec/mjpeg.h
  * MJPEG encoder and decoder.
  */
 
-#ifndef FFMPEG_MJPEG_H
-#define FFMPEG_MJPEG_H
+#ifndef AVCODEC_MJPEG_H
+#define AVCODEC_MJPEG_H
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "put_bits.h"
 
 
 /* JPEG marker codes */
@@ -152,4 +152,4 @@ void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
                                   const uint8_t *bits_table,
                                   const uint8_t *val_table);
 
-#endif /* FFMPEG_MJPEG_H */
+#endif /* AVCODEC_MJPEG_H */