From 87f87ccf32055aca25fa08e29e22cca1ba9976d5 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 29 Mar 2015 13:24:18 +0200
Subject: [PATCH] mjpeg: Use a more precise type for put_marker()
---
libavcodec/mjpeg.h | 4 ++--
libavcodec/mjpegenc.h | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h
index 8b7bf8d8222..39c9c32948b 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 eec4d2554db..aa8697edc80 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);
--
GitLab