Changeset d2d794f3 in ffmpeg

Timestamp:

Dec 19, 2013, 2:18:07 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e72f5abb

Parents:

fde74d1b (diff), e121a725 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)