virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

mjpeg: Use a more precise type for put_marker()

Browse Source
This commit is contained in:
Diego Biurrun 2015-03-29 13:24:18 +02:00
parent e6e3dcba0c
commit 87f87ccf32
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mjpeg.h
View File

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

3
libavcodec/mjpegenc.h
View File

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