diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-19 03:18:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-19 03:18:07 +0100 |
| commit | d2d794f3aa55ab77557bb1d6082f9f6dfa90400d (patch) | |
| tree | f36a4d311c359521d3fedf97417def9e80db158c /libavformat | |
| parent | fde74d1b9d338e2f9c9d7eac2023388d59c98543 (diff) | |
| parent | e121a725c38fe9f0749e96d45738c55fdcfe2ac5 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Explicitly specify the pixel format for the pngparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions