[FFmpeg-cvslog] Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'
Michael Niedermayer
git at videolan.org
Mon Jun 17 00:27:43 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 17 00:21:22 2013 +0200| [a4a2e894fca19e284c28a4114d7718bf5588dfa1] | committer: Michael Niedermayer
Merge commit '985f34b75653d02eda8eb8def3412f8577f19b01'
* commit '985f34b75653d02eda8eb8def3412f8577f19b01':
utils: fix avcodec_flush_buffers pre-reference counting compatibility
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4a2e894fca19e284c28a4114d7718bf5588dfa1
---
More information about the ffmpeg-cvslog
mailing list