diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-23 13:45:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-23 13:45:46 +0200 |
| commit | fb0df5c113e0dff2311201dc828db1648174972b (patch) | |
| tree | 92424a47e1814dbda2041e3e697d50a4f70d89d6 /libavcodec/ass.c | |
| parent | 780b1aa1efa872ec7401735764795134427db1ab (diff) | |
| parent | f11e4045b9c40c57cade481fc8225ab35ccb5fe2 (diff) | |
| download | ffmpeg-fb0df5c113e0dff2311201dc828db1648174972b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: More msvc/icl combining
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass.c')
0 files changed, 0 insertions, 0 deletions