Browse Source

mjpeg: Use a more precise type for put_marker()

tags/n2.7
Diego Biurrun 10 years ago
parent
commit
87f87ccf32
2 changed files with 4 additions and 3 deletions
  1. +2
    -2
      libavcodec/mjpeg.h
  2. +2
    -1
      libavcodec/mjpegenc.h

+ 2
- 2
libavcodec/mjpeg.h View File

@@ -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){\


+ 2
- 1
libavcodec/mjpegenc.h View File

@@ -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);


Loading…
Cancel
Save