[FFmpeg-cvslog] Merge commit '8281cd5cb80582d668ce0848e0e035b383f161f6'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Aug  1 16:46:57 2016 -0300| [fd4eb56528e1bf6529397051838a28d2a39d8e01] | committer: James Almer

Merge commit '8281cd5cb80582d668ce0848e0e035b383f161f6'

* commit '8281cd5cb80582d668ce0848e0e035b383f161f6':
  h264_cabac: drop an always true condition

Merged-by: James Almer <jamrial at gmail.com>

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

 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 5776be9..fe83425 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -2358,7 +2358,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);


======================================================================