virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'

Browse Source 
* commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80':
  mjpeg: Move code only used in the encoder(s) to the appropriate header

Conflicts:
	libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-30 21:05:23 +02:00
commit 794e9fb5a6
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/jpeglsenc.c
View File

@ -32,6 +32,7 @@
#include "internal.h"
#include "mathops.h"
#include "mjpeg.h"
#include "mjpegenc.h"
#include "jpegls.h"
/**

7
libavcodec/mjpeg.h
View File

@ -36,7 +36,6 @@
#include "libavutil/internal.h"
#include "avcodec.h"
#include "put_bits.h"
/* JPEG marker codes */
typedef enum {
@ -120,12 +119,6 @@ typedef enum {
/* 0x02 -> 0xbf reserved */
} JPEG_MARKER;
static inline void put_marker(PutBitContext *p, int code)
{
put_bits(p, 8, 0xff);
put_bits(p, 8, code);
}
#define PREDICT(ret, topleft, top, left, predictor)\
switch(predictor){\
case 0: ret= 0; break;\

1
libavcodec/mjpegdec.c
View File

@ -41,6 +41,7 @@
#include "mjpeg.h"
#include "mjpegdec.h"
#include "jpeglsdec.h"
#include "put_bits.h"
#include "tiff.h"
#include "exif.h"
#include "bytestream.h"

7
libavcodec/mjpegenc.h
View File

@ -36,6 +36,7 @@
#include <stdint.h>
#include "mpegvideo.h"
#include "put_bits.h"
typedef struct MJpegContext {
uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chrom, for easier addressing
@ -49,6 +50,12 @@ typedef struct MJpegContext {
uint16_t huff_code_ac_chrominance[256];
} MJpegContext;
static inline void put_marker(PutBitContext *p, int code)
{
put_bits(p, 8, 0xff);
put_bits(p, 8, code);
}
int ff_mjpeg_encode_init(MpegEncContext *s);
void ff_mjpeg_encode_close(MpegEncContext *s);
void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64]);

1
libavcodec/mjpegenc_common.c
View File

@ -30,6 +30,7 @@
#include "avcodec.h"
#include "idctdsp.h"
#include "put_bits.h"
#include "mjpegenc.h"
#include "mjpegenc_common.h"
#include "mjpeg.h"