[FFmpeg-cvslog] Merge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'
Michael Niedermayer
git at videolan.org
Sat Mar 2 11:57:34 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 2 11:53:19 2013 +0100| [2d2e6db7cfe5d50fb428a03f7c6450e7248d0a36] | committer: Michael Niedermayer
Merge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'
* commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8':
h264: on reference overflow, reset the reference count to 0, not 1.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d2e6db7cfe5d50fb428a03f7c6450e7248d0a36
---
More information about the ffmpeg-cvslog
mailing list