Disable SVQ3 checks if SVQ3 support is not compiled in.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16462 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index eeb5290fed03da616a885c9041ea0b7dc2fc3684..ce926a3e17655197a5d20fdd9641b06820e03f09 100644 (file)
--- 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);