aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-30 10:49:43 +0000
committerGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-30 10:49:43 +0000
commit2bc0ac14448d6812a4b9109f1dabcccc1c100988 (patch)
treec1d114b20f3434065e74f6907b8dcc249b05744d
parent611e0b9dd0ac76f72f76c4dfa88415bfc8609b41 (diff)
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
-rw-r--r--libvo/jpeg_enc.c15
1 files changed, 1 insertions, 14 deletions
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 ***********/