xsubdec: Convert to the new bitstream reader

[ffmpeg] / libavcodec / mjpegenc.h

diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h
index 6054db111332b307c1df740ccb5f538299fedf12..bbb0f0ebce6b9835fc600b7d6ed52002928435e3 100644 (file)
--- a/libavcodec/mjpegenc.h
+++ b/libavcodec/mjpegenc.h
@@ -35,10 +35,12 @@
 
 #include <stdint.h>
 
+#include "mjpeg.h"
 #include "mpegvideo.h"
+#include "put_bits.h"
 
 typedef struct MJpegContext {
-    uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chrom, for easier addressing
+    uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chroma, for easier addressing
     uint16_t huff_code_dc_luminance[12];
     uint8_t huff_size_dc_chrominance[12];
     uint16_t huff_code_dc_chrominance[12];
@@ -49,8 +51,14 @@ typedef struct MJpegContext {
     uint16_t huff_code_ac_chrominance[256];
 } MJpegContext;
 
+static inline void put_marker(PutBitContext *p, enum JpegMarker code)
+{
+    put_bits(p, 8, 0xff);
+    put_bits(p, 8, code);
+}
+
 int  ff_mjpeg_encode_init(MpegEncContext *s);
 void ff_mjpeg_encode_close(MpegEncContext *s);
-void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[6][64]);
+void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[8][64]);
 
 #endif /* AVCODEC_MJPEGENC_H */