[FFmpeg-cvslog] Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'
Michael Niedermayer
git at videolan.org
Mon Oct 28 13:06:33 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 12:47:10 2013 +0100| [252f56636ca0fc1d5223d091b1d56f6a5ab2b8af] | committer: Michael Niedermayer
Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'
* commit '97de206b44a48da726807cc3e7b9448a8112760b':
lavc: disable CRC checking by default
Conflicts:
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=252f56636ca0fc1d5223d091b1d56f6a5ab2b8af
---
More information about the ffmpeg-cvslog
mailing list