From 2bc0ac14448d6812a4b9109f1dabcccc1c100988 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 30 Dec 2007 10:49:43 +0000 Subject: Do not duplicate MJpegContext struct, #include the proper header instead. This also fixes the warnings: jpeg_enc.c:342: warning: implicit declaration of function 'ff_mjpeg_encode_init' jpeg_enc.c:384: warning: implicit declaration of function 'ff_mjpeg_encode_picture_header' jpeg_enc.c:489: warning: implicit declaration of function 'ff_mjpeg_encode_picture_trailer' jpeg_enc.c:500: warning: implicit declaration of function 'ff_mjpeg_encode_close' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25545 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/jpeg_enc.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'libvo') diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index f5777f7401..8a5d6e072f 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -35,25 +35,12 @@ #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" +#include "libavcodec/mjpegenc.h" #include "jpeg_enc.h" extern int avcodec_inited; -/* zr_mjpeg_encode_mb needs access to these tables for the black & white - * option */ -typedef struct MJpegContext { - uint8_t huff_size_dc_luminance[12]; - uint16_t huff_code_dc_luminance[12]; - uint8_t huff_size_dc_chrominance[12]; - uint16_t huff_code_dc_chrominance[12]; - - uint8_t huff_size_ac_luminance[256]; - uint16_t huff_code_ac_luminance[256]; - uint8_t huff_size_ac_chrominance[256]; - uint16_t huff_code_ac_chrominance[256]; -} MJpegContext; - /* Begin excessive code duplication ************************************/ /* Code coming from mpegvideo.c and mjpeg.c in ../libavcodec ***********/ -- cgit v1.2.3