[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Mon Dec 31 14:23:56 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 31 14:15:42 2012 +0100| [08196c785a1df33da435c5a669c9c560f647290c] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: suppress -fPIC in msvc builds
Drop unnecessary 'l' length modifier when printfing double values.
truemotion2: Sanitize tm2_read_header()
Conflicts:
libavcodec/truemotion2.c
libavfilter/src_movie.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08196c785a1df33da435c5a669c9c560f647290c
---
More information about the ffmpeg-cvslog
mailing list