diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-31 01:02:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-31 01:11:02 +0200 |
| commit | a105931d3edfd47f287e47e858ef080f0199cd47 (patch) | |
| tree | e9657f4a68b5b33a9a17877cdcd0ca368778f37a /libavcodec/mjpeg.h | |
| parent | 48183f144d1d6f7af8e8526a2e020a6a88ad38c0 (diff) | |
| parent | 4978850ca2cb1ec6908f5bc79cc592ca454d11e8 (diff) | |
| download | ffmpeg-a105931d3edfd47f287e47e858ef080f0199cd47.tar.gz | |
Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'
* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8':
build: Split JPEG-related tables off into a separate component
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.h')
| -rw-r--r-- | libavcodec/mjpeg.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index 869aebb135..cd5d0af2ac 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -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 */ |