diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 00:54:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 00:54:37 +0200 |
| commit | e771425e985efd140474c2bc93333da6de14edee (patch) | |
| tree | dd5a77f7d7d3e787d6be0bf7c9f8e964acb222a9 /libswscale/x86 | |
| parent | 6f9e6ac6aa3c670cb5c9f853095ae47fe0c40487 (diff) | |
| parent | ec772cca60423b9994fe00c7cef239f93eae6112 (diff) | |
| download | ffmpeg-e771425e985efd140474c2bc93333da6de14edee.tar.gz | |
Merge commit 'ec772cca60423b9994fe00c7cef239f93eae6112' into release/0.10
* commit 'ec772cca60423b9994fe00c7cef239f93eae6112':
drawtext: Drop pointless header
configure: Support preprocessor macros as header names
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
0 files changed, 0 insertions, 0 deletions