diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 14:15:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 14:20:01 +0100 |
| commit | 08196c785a1df33da435c5a669c9c560f647290c (patch) | |
| tree | 2f1e51c4f37f40cbcdff0c9858f0ae2acf5649ef /libswscale | |
| parent | 98275283d52622c16a6d59f508de7d40216e8b63 (diff) | |
| parent | 506409776c49910050f3150d0e51d11b44d323ed (diff) | |
| download | ffmpeg-streaming-08196c785a1df33da435c5a669c9c560f647290c.zip ffmpeg-streaming-08196c785a1df33da435c5a669c9c560f647290c.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions
