generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'eb1aa871d4ef9fc11484de436fa02c352b1b7cac' into release/1.1

Browse Source 
* commit 'eb1aa871d4ef9fc11484de436fa02c352b1b7cac':
  h264_cabac: Break infinite loops

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-10 13:11:38 +01:00
parent 31b697f19c eb1aa871d4
commit b69c7f20e8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_cabac.c
View File

@@ -1712,7 +1712,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block,
\ \
if( coeff_abs >= 15 ) { \ if( coeff_abs >= 15 ) { \
int j = 0; \ int j = 0; \
while( get_cabac_bypass( CC ) ) { \ while (get_cabac_bypass(CC) && j < 30) { \
j++; \ j++; \
} \ } \
\ \