generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

Browse Source 
* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
  build: Split JPEG-related tables off into a separate component

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-31 01:02:00 +02:00
parent 48183f144d 4978850ca2
commit a105931d3e
12 changed files with 70 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/mjpeg.h
View File

@@ -33,10 +33,6 @@
#ifndef AVCODEC_MJPEG_H
#define AVCODEC_MJPEG_H
#include "libavutil/internal.h"
#include "avcodec.h"
/* JPEG marker codes */
enum JpegMarker {
/* start of frame */
@@ -132,19 +128,4 @@ enum JpegMarker {
case 7: ret= (left + top)>>1; break;\
}
extern av_export const uint8_t avpriv_mjpeg_bits_dc_luminance[];
extern av_export const uint8_t avpriv_mjpeg_val_dc[];
extern av_export const uint8_t avpriv_mjpeg_bits_dc_chrominance[];
extern av_export const uint8_t avpriv_mjpeg_bits_ac_luminance[];
extern av_export const uint8_t avpriv_mjpeg_val_ac_luminance[];
extern av_export const uint8_t avpriv_mjpeg_bits_ac_chrominance[];
extern av_export const uint8_t avpriv_mjpeg_val_ac_chrominance[];
void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
const uint8_t *bits_table,
const uint8_t *val_table);
#endif /* AVCODEC_MJPEG_H */