diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-25 21:42:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-25 21:43:13 +0200 |
| commit | ee5964cc9c8c8167c1998482fe639263c6783e9a (patch) | |
| tree | c35c10c9a982d744ed60cf810218061f0b28df22 /doc/encoders.texi | |
| parent | efcc334c9d419d3b05612f321730b6d13a697b96 (diff) | |
| parent | 322e4194dd24ff06aeef72210beee4f19efa2e08 (diff) | |
| download | ffmpeg-ee5964cc9c8c8167c1998482fe639263c6783e9a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
msvc/icl: Intel Compiler support on Windows
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/encoders.texi')
0 files changed, 0 insertions, 0 deletions