diff options
| author | Diego Biurrun <diego@biurrun.de> | 2015-03-29 13:24:18 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2015-03-30 17:51:20 +0200 |
| commit | 87f87ccf32055aca25fa08e29e22cca1ba9976d5 (patch) | |
| tree | c49682d83d30d1073410ed1c2d80064e6b443458 | |
| parent | e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80 (diff) | |
mjpeg: Use a more precise type for put_marker()
| -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 8b7bf8d822..39c9c32948 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 eec4d2554d..aa8697edc8 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); |