diff options
| author | James Almer <jamrial@gmail.com> | 2016-08-01 22:46:57 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-08-01 22:46:57 +0300 |
| commit | fd4eb56528e1bf6529397051838a28d2a39d8e01 (patch) | |
| tree | d1a8032b5a72c3628c060722f8d0b00acfa6b21c /libavcodec/h264_cabac.c | |
| parent | f41048f6ec5671c2e09ae317cecc1e98ecc3c2ce (diff) | |
| parent | 8281cd5cb80582d668ce0848e0e035b383f161f6 (diff) | |
Merge commit '8281cd5cb80582d668ce0848e0e035b383f161f6'
* commit '8281cd5cb80582d668ce0848e0e035b383f161f6':
h264_cabac: drop an always true condition
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 5776be9dab..fe83425d13 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); |