Merge svn changes up to 27824

Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c

1 files changed, 1 insertions, 20 deletions

diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c
index 546c63cf10..32b4f9b7bc 100644
--- a/libmpcodecs/vf_zrmjpeg.c
+++ b/libmpcodecs/vf_zrmjpeg.c
@@ -49,15 +49,11 @@
  * be2me_32, otherwise the linker will complain that it doesn't exist */
 #define HAVE_AV_CONFIG_H
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/mpegvideo.h"
+#include "libavcodec/mjpegenc.h"
 //#include "jpeg_enc.h" /* this file is not present yet */
 
 #undef malloc
 #undef free
-#undef realloc
-
-extern int avcodec_initialized;
 
 /* some convenient #define's, is this portable enough? */
 /// Printout  with vf_zrmjpeg: prefix at VERBOSE level
@@ -72,21 +68,6 @@ extern int avcodec_initialized;
 // set when init is done, so that initialization is not done twice.
 extern int avcodec_initialized;
 
-/// structure copied from mjpeg.c
-/* zrmjpeg_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;
-
 /// The get_pixels() routine to use. The real routine comes from dsputil
 static void (*get_pixels)(DCTELEM *restrict block, const uint8_t *pixels, int line_size);