diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 20:52:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 21:05:16 +0200 |
| commit | ffed987a4d4afb8851d80b772eb9ee02cda20ef9 (patch) | |
| tree | c5eee86590050ef0cc5ae2ff7b57bf6a1de1e9fe /libswscale/Makefile | |
| parent | 39e89f521159474a854927840e5a8cc4350ee587 (diff) | |
| parent | 7b734ee55dbb8476d7ad63c7daf55c534cf82d5d (diff) | |
| download | ffmpeg-ffed987a4d4afb8851d80b772eb9ee02cda20ef9.tar.gz | |
Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'
* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
lavf: Open PICT images with Quickdraw
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/Makefile')
0 files changed, 0 insertions, 0 deletions