[MPlayer-cvslog] r19625 - in trunk: libmpcodecs/vf_zrmjpeg.c libvo/jpeg_enc.c

[rik]

Author: rik
Date: Fri Sep  1 20:49:40 2006
New Revision: 19625

Modified:
   trunk/libmpcodecs/vf_zrmjpeg.c
   trunk/libvo/jpeg_enc.c

Log:
Patch from Karolina Lindqvist <karolina.lindqvist at kramnet.se>
"There is a bug in the zoran -vo zr driver, that makes the output garbled
always. It also probably affects the zrmjpeg filter.  This patch takes care of
the problem."

Patch tested and OK. And 10l to me, because this bug probably has existed for a
looong time.



Modified: trunk/libmpcodecs/vf_zrmjpeg.c
==============================================================================
--- trunk/libmpcodecs/vf_zrmjpeg.c	(original)
+++ trunk/libmpcodecs/vf_zrmjpeg.c	Fri Sep  1 20:49:40 2006
@@ -359,6 +359,8 @@
 
 	/* alloc bogus avctx to keep MPV_common_init from segfaulting */
 	j->s->avctx = calloc(sizeof(*j->s->avctx), 1);
+	/* Set up to encode mjpeg */
+	j->s->avctx->codec_id = CODEC_ID_MJPEG;
 
 	/* make MPV_common_init allocate important buffers, like s->block */
 	j->s->avctx->thread_count = 1;

Modified: trunk/libvo/jpeg_enc.c
==============================================================================
--- trunk/libvo/jpeg_enc.c	(original)
+++ trunk/libvo/jpeg_enc.c	Fri Sep  1 20:49:40 2006
@@ -351,6 +351,8 @@
 
 	/* alloc bogus avctx to keep MPV_common_init from segfaulting */
 	j->s->avctx = calloc(sizeof(*j->s->avctx), 1);
+	/* Set up to encode mjpeg */
+	j->s->avctx->codec_id = CODEC_ID_MJPEG;
 
 	/* make MPV_common_init allocate important buffers, like s->block */
 	j->s->avctx->thread_count = 1;