-
Michael Niedermayer authored
* commit 'def69553': h264_cabac: Break infinite loops Conflicts: libavcodec/h264_cabac.c See: cdf0877bMerged-by: Michael Niedermayer <michaelni@gmx.at>
330e892c
* commit 'def69553': h264_cabac: Break infinite loops Conflicts: libavcodec/h264_cabac.c See: cdf0877bMerged-by: Michael Niedermayer <michaelni@gmx.at>