[SCM] libav/wheezy-security: svq1enc: Set picture_structure correctly

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Oct 19 20:18:10 UTC 2014


The following commit has been merged in the wheezy-security branch:
commit 3eed35addb461c42471e0367bb6cd68d8ffd3aec
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Aug 6 16:28:13 2012 +0200

    svq1enc: Set picture_structure correctly
    
    This fixes assert failures when running in debug mode.
    
    Signed-off-by: Martin Storsjö <martin at martin.st>
    (cherry picked from commit 2d7d91f06d6a1d243dc74c96d3389ee237a3b906)
    Signed-off-by: Diego Biurrun <diego at biurrun.de>

diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index 82b828b..d90346e 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -486,6 +486,7 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx)
 
     s->avctx= avctx;
     s->m.avctx= avctx;
+    s->m.picture_structure = PICT_FRAME;
     s->m.me.temp      =
     s->m.me.scratchpad= av_mallocz((avctx->width+64)*2*16*2*sizeof(uint8_t));
     s->m.me.map       = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t));

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list