[FFmpeg-cvslog] h264_cabac: drop an always true condition

Anton Khirnov git at videolan.org
Mon Aug 1 23:04:45 EEST 2016


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed May 18 14:31:48 2016 +0200| [8281cd5cb80582d668ce0848e0e035b383f161f6] | committer: Anton Khirnov

h264_cabac: drop an always true condition

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8281cd5cb80582d668ce0848e0e035b383f161f6
---

 libavcodec/h264_cabac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 203803f..ae1ef6b 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);



More information about the ffmpeg-cvslog mailing list