h264_mp4toannexb_bsf: do not fail on annex B extradata

[ffmpeg] / libavcodec / mjpeg.h

diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h
index 8b7bf8d8222366acce55494de56aa94b7f0aaf3a..1ebe283748f5e844acd0e699837e48d9ee781ff7 100644 (file)
--- a/libavcodec/mjpeg.h
+++ b/libavcodec/mjpeg.h
@@ -33,12 +33,8 @@
 #ifndef AVCODEC_MJPEG_H
 #define AVCODEC_MJPEG_H
 
-#include "libavutil/internal.h"
-
-#include "avcodec.h"
-
 /* JPEG marker codes */
-typedef enum {
+enum JpegMarker {
     /* start of frame */
     SOF0  = 0xc0,       /* baseline */
     SOF1  = 0xc1,       /* extended sequential, huffman */
@@ -117,7 +113,7 @@ typedef enum {
     TEM   = 0x01,       /* temporary private use for arithmetic coding */
 
     /* 0x02 -> 0xbf reserved */
-} JPEG_MARKER;
+};
 
 #define PREDICT(ret, topleft, top, left, predictor)\
     switch(predictor){\
@@ -131,19 +127,4 @@ typedef enum {
         case 7: ret= (left + top)>>1; break;\
     }
 
-extern av_export const uint8_t avpriv_mjpeg_bits_dc_luminance[];
-extern av_export const uint8_t avpriv_mjpeg_val_dc[];
-
-extern av_export const uint8_t avpriv_mjpeg_bits_dc_chrominance[];
-
-extern av_export const uint8_t avpriv_mjpeg_bits_ac_luminance[];
-extern av_export const uint8_t avpriv_mjpeg_val_ac_luminance[];
-
-extern av_export const uint8_t avpriv_mjpeg_bits_ac_chrominance[];
-extern av_export const uint8_t avpriv_mjpeg_val_ac_chrominance[];
-
-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 /* AVCODEC_MJPEG_H */