diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-01-07 01:58:04 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-01-07 01:58:04 +0000 |
| commit | 8b6871ed4d17d908d1b5fdc1bb916a7b607c8341 (patch) | |
| tree | e22f8926f76278ea91a066124f1593bfa059df9f | |
| parent | 11e6d03a9d06420a5344326ee448de6778d02d8e (diff) | |
| download | ffmpeg-8b6871ed4d17d908d1b5fdc1bb916a7b607c8341.tar.gz | |
Disable SVQ3 checks if SVQ3 support is not compiled in.
Originally committed as revision 16462 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index eeb5290fed..ce926a3e17 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); |