diff options
| author |  rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-01 18:49:40 +0000 |
|---|---|---|
| committer | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-01 18:49:40 +0000 |
| commit | 3d5fedd66a0cc258c5e6423abbf73cd1da015617 (patch) | |
| tree | ca87084b4f43f7b4369c7c10c099f28c8d40f79d | |
| parent | 3b4e87616d9ad650258c74eee7fa8a07c924d2f4 (diff) | |
Patch from Karolina Lindqvist <karolina.lindqvist@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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19625 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/vf_zrmjpeg.c | 2 | ||||
| -rw-r--r-- | libvo/jpeg_enc.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index eb9d816382..9e52dc9172 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -359,6 +359,8 @@ static jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, /* 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; diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index 060e097fd1..bdb9748656 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -351,6 +351,8 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, /* 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; |