[FFmpeg-cvslog] Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 15 14:31:33 2015 +0100| [330e892c083e21bf11235425db649a73c28fed99] | committer: Michael Niedermayer

Merge commit 'def69553e745e007925147b2e7e4b32c57d08fdf'

* commit 'def69553e745e007925147b2e7e4b32c57d08fdf':
  h264_cabac: Break infinite loops

Conflicts:
	libavcodec/h264_cabac.c

See: cdf0877bc341684c56ac1fe057397adbadf329ee
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=330e892c083e21bf11235425db649a73c28fed99
---