diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-31 00:47:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-31 00:48:04 +0200 |
| commit | 48183f144d1d6f7af8e8526a2e020a6a88ad38c0 (patch) | |
| tree | bdf395dc9de6ef32a268cbb0b878475374a5d93f | |
| parent | 21ee6da70c4e5a56ea74aec0f8d21465a873b874 (diff) | |
| parent | 87f87ccf32055aca25fa08e29e22cca1ba9976d5 (diff) | |
| download | ffmpeg-48183f144d1d6f7af8e8526a2e020a6a88ad38c0.tar.gz | |
Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'
* commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5':
mjpeg: Use a more precise type for put_marker()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mjpeg.h | 4 | ||||
| -rw-r--r-- | libavcodec/mjpegenc.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index 0e62b2aeff..869aebb135 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -38,7 +38,7 @@ #include "avcodec.h" /* JPEG marker codes */ -typedef enum { +enum JpegMarker { /* start of frame */ SOF0 = 0xc0, /* baseline */ SOF1 = 0xc1, /* extended sequential, huffman */ @@ -117,7 +117,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){\ diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index ad2a55425e..4d77e166ee 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -35,6 +35,7 @@ #include <stdint.h> +#include "mjpeg.h" #include "mpegvideo.h" #include "put_bits.h" @@ -50,7 +51,7 @@ typedef struct MJpegContext { uint16_t huff_code_ac_chrominance[256]; } 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, code); |