* commit 'def69553e745e007925147b2e7e4b32c57d08fdf': h264_cabac: Break infinite loops Conflicts: libavcodec/h264_cabac.c See: cdf0877bc3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
cdf0877bc3