Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'

* commit 'def69553e745e007925147b2e7e4b32c57d08fdf': h264_cabac: Break infinite loops Conflicts: libavcodec/h264_cabac.c See: cdf0877bc3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 330e892c08
parent 2bc841815c def69553e7
commit 330e892c08
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@ -1714,7 +1714,7 @@ decode_cabac_residual_internal(H264Context *h, int16_t *block,
 \
            if( coeff_abs >= 15 ) { \
                int j = 0; \
-                while(get_cabac_bypass( CC ) && j<30) { \
+                while (get_cabac_bypass(CC) && j < 30) { \
                    j++; \
                } \
 \