diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 14:31:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 14:32:33 +0100 |
| commit | 330e892c083e21bf11235425db649a73c28fed99 (patch) | |
| tree | b94bf9fc69cbba6feecae3f9d3d757317e990249 /libavcodec/h264_cabac.c | |
| parent | 2bc841815c9c0ae37657e40f94d0dce2770f1e27 (diff) | |
| parent | def69553e745e007925147b2e7e4b32c57d08fdf (diff) | |
Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'
* commit 'def69553e745e007925147b2e7e4b32c57d08fdf':
h264_cabac: Break infinite loops
Conflicts:
libavcodec/h264_cabac.c
See: cdf0877bc341684c56ac1fe057397adbadf329ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 6455ee7b2d..692cf1d874 100644 --- 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++; \ } \ \ |