ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Mon Mar
9 12:26:49 2015 +0100| [45eb2a0d49c1086f5f6ed56490821da7fd3dea0b] | committer:
Michael Niedermayer
Merge commit '91ef250713d04d675a16e5b030d7226baafe3f82' into release/2.2
* commit '91ef250713d04d675a16e5b030d7226baafe3f82':
h264_cabac: Break infinite loops
Conflicts:
libavcodec/h264_cabac.c
See: cdf0877bc341684c56ac1fe057397adbadf329ee
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45eb2a0d49c1086f5f6ed56490821da7fd3dea0b
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
