Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Dec 2012 13:15:42 +0000 (14:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 31 Dec 2012 13:20:01 +0000 (14:20 +0100)
commit08196c785a1df33da435c5a669c9c560f647290c
tree2f1e51c4f37f40cbcdff0c9858f0ae2acf5649ef
parent98275283d52622c16a6d59f508de7d40216e8b63
parent506409776c49910050f3150d0e51d11b44d323ed
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>
configure
libavcodec/truemotion2.c
libavfilter/vf_frei0r.c
libavfilter/vf_hqdn3d.c