[SCM] libav/experimental: Disable SVQ3 checks if SVQ3 support is not compiled in.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:34:46 UTC 2013


The following commit has been merged in the experimental branch:
commit 8b6871ed4d17d908d1b5fdc1bb916a7b607c8341
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Jan 7 01:58:04 2009 +0000

    Disable SVQ3 checks if SVQ3 support is not compiled in.
    
    Originally committed as revision 16462 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index eeb5290..ce926a3 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2414,7 +2414,8 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){
     int i;
     int *block_offset = &h->block_offset[0];
     const int transform_bypass = !simple && (s->qscale == 0 && h->sps.transform_bypass);
-    const int is_h264 = simple || s->codec_id == CODEC_ID_H264;
+    /* is_h264 should always be true if SVQ3 is disabled. */
+    const int is_h264 = !ENABLE_SVQ3_DECODER || simple || s->codec_id == CODEC_ID_H264;
     void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride);
     void (*idct_dc_add)(uint8_t *dst, DCTELEM *block, int stride);
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list