diff options
| author | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
|---|---|---|
| committer | rogerdpack <rogerpack2005@gmail.com> | 2013-01-15 19:09:15 -0700 |
| commit | c540312ac3b58e0bbd751844fc2c47c6e3713cf5 (patch) | |
| tree | fcf92b1c0f1772b379828125c2555a47d1c81c6b /libavcodec/h264_cabac.c | |
| parent | 47e88486b4b3b3de992b07f89dfaedf410a8bd5e (diff) | |
| parent | 2b20397e1fbe52db800ef5deb810f7bc2602f248 (diff) | |
| download | ffmpeg-c540312ac3b58e0bbd751844fc2c47c6e3713cf5.tar.gz | |
Merge remote-tracking branch 'origin/master' into combined
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 bbca26ab4d..54b3775761 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1712,7 +1712,7 @@ decode_cabac_residual_internal(H264Context *h, int16_t *block, \ if( coeff_abs >= 15 ) { \ int j = 0; \ - while( get_cabac_bypass( CC ) ) { \ + while(get_cabac_bypass( CC ) && j<30) { \ j++; \ } \ \ |