Commit 48183f14 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '87f87ccf'

* commit '87f87ccf':
  mjpeg: Use a more precise type for put_marker()
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 21ee6da7 87f87ccf
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "avcodec.h" #include "avcodec.h"
/* JPEG marker codes */ /* JPEG marker codes */
typedef enum { enum JpegMarker {
/* start of frame */ /* start of frame */
SOF0 = 0xc0, /* baseline */ SOF0 = 0xc0, /* baseline */
SOF1 = 0xc1, /* extended sequential, huffman */ SOF1 = 0xc1, /* extended sequential, huffman */
...@@ -117,7 +117,7 @@ typedef enum { ...@@ -117,7 +117,7 @@ typedef enum {
TEM = 0x01, /* temporary private use for arithmetic coding */ TEM = 0x01, /* temporary private use for arithmetic coding */
/* 0x02 -> 0xbf reserved */ /* 0x02 -> 0xbf reserved */
} JPEG_MARKER; };
#define PREDICT(ret, topleft, top, left, predictor)\ #define PREDICT(ret, topleft, top, left, predictor)\
switch(predictor){\ switch(predictor){\
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <stdint.h> #include <stdint.h>
#include "mjpeg.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "put_bits.h" #include "put_bits.h"
...@@ -50,7 +51,7 @@ typedef struct MJpegContext { ...@@ -50,7 +51,7 @@ typedef struct MJpegContext {
uint16_t huff_code_ac_chrominance[256]; uint16_t huff_code_ac_chrominance[256];
} MJpegContext; } MJpegContext;
static inline void put_marker(PutBitContext *p, int code) static inline void put_marker(PutBitContext *p, enum JpegMarker code)
{ {
put_bits(p, 8, 0xff); put_bits(p, 8, 0xff);
put_bits(p, 8, code); put_bits(p, 8, code);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment