[FFmpeg-cvslog] Merge commit '07db7a0dd8239e255c08800162eb45b82c2c49fe' into release/2.4

Michael Niedermayer git at videolan.org
Sat Feb 28 19:29:16 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 28 19:16:23 2015 +0100| [7ca10906b4ce4bdde6d681cc3fb2f5567f362d34] | committer: Michael Niedermayer

Merge commit '07db7a0dd8239e255c08800162eb45b82c2c49fe' into release/2.4

* commit '07db7a0dd8239e255c08800162eb45b82c2c49fe':
  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=7ca10906b4ce4bdde6d681cc3fb2f5567f362d34
---





More information about the ffmpeg-cvslog mailing list