Mercurial > mplayer.hg

changeset 25517:788499fc2ae7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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'
author diego
date Sun, 30 Dec 2007 10:49:43 +0000
parents dd86735178a6
children e2fb1ad9b2b4
files libvo/jpeg_enc.c
diffstat 1 files changed, 1 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/jpeg_enc.c	Sun Dec 30 10:32:33 2007 +0000
+++ b/libvo/jpeg_enc.c	Sun Dec 30 10:49:43 2007 +0000
@@ -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 ***********/