aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-05-18 14:31:48 +0200
committerAnton Khirnov <anton@khirnov.net>2016-06-21 11:17:53 +0200
commit8281cd5cb80582d668ce0848e0e035b383f161f6 (patch)
tree35b9120d7b326ac384e4f05fe8e0c92b01e69333
parent5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c (diff)
downloadffmpeg-8281cd5cb80582d668ce0848e0e035b383f161f6.tar.gz
h264_cabac: drop an always true condition
-rw-r--r--libavcodec/h264_cabac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 203803fbdf..ae1ef6b08c 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -2340,7 +2340,7 @@ decode_intra_mb:
}
}
if (sl->top_type && !IS_8x8DCT(sl->top_type)){
- uint32_t top_empty = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 0x40404040;
+ uint32_t top_empty = !IS_INTRA(mb_type) ? 0 : 0x40404040;
AV_WN32A(&nnz_cache[4+8* 0], top_empty);
AV_WN32A(&nnz_cache[4+8* 5], top_empty);
AV_WN32A(&nnz_cache[4+8*10], top_empty);