highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '07db7a0dd8239e255c08800162eb45b82c2c49fe' into release/2.4

Browse Source 
* commit '07db7a0dd8239e255c08800162eb45b82c2c49fe':
  h264_cabac: Break infinite loops

Conflicts:
	libavcodec/h264_cabac.c

See: cdf0877bc341684c56ac1fe057397adbadf329ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-28 19:16:23 +01:00
commit 7ca10906b4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_cabac.c
View File

@ -1713,7 +1713,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++; \
} \
\