Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 13:31:33 +0000 (14:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 13:32:33 +0000 (14:32 +0100)
commit330e892c083e21bf11235425db649a73c28fed99
treeb94bf9fc69cbba6feecae3f9d3d757317e990249
parent2bc841815c9c0ae37657e40f94d0dce2770f1e27
parentdef69553e745e007925147b2e7e4b32c57d08fdf
Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'

* commit 'def69553e745e007925147b2e7e4b32c57d08fdf':
  h264_cabac: Break infinite loops

Conflicts:
libavcodec/h264_cabac.c

See: cdf0877bc341684c56ac1fe057397adbadf329ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_cabac.c