xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 12:09:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'

Browse Source 
* commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5':
  mjpeg: Use a more precise type for put_marker()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-31 00:47:40 +02:00
commit 48183f144d
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"
/* 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){\

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