summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-02-16 14:41:42 +0000
committerrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-02-16 14:41:42 +0000
commitd8e6384a054aa0ddc93f2fd0f70caf1128bd0584 (patch)
tree24c1bd1bbb9dc4dbde094f28e4148b37b257c14c /libmpcodecs
parent233db62d72bde76f1b52d9facfae07fe92b6c279 (diff)
downloadmpv-d8e6384a054aa0ddc93f2fd0f70caf1128bd0584.tar.bz2
mpv-d8e6384a054aa0ddc93f2fd0f70caf1128bd0584.tar.xz
fixing segfault: libavcodec doesn't allocate some buffers if avctx->thread_count == 0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11962 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_zrmjpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c
index 75a545fe6d..89f0d6810d 100644
--- a/libmpcodecs/vf_zrmjpeg.c
+++ b/libmpcodecs/vf_zrmjpeg.c
@@ -360,6 +360,9 @@ 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);
+ /* make MPV_common_init allocate important buffers, like s->block */
+ j->s->avctx->thread_count = 1;
+
if (MPV_common_init(j->s) < 0) {
free(j->s);
free(j);