Merge commit 'eb1aa871d4ef9fc11484de436fa02c352b1b7cac' into release/1.1

* 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

View File

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