Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 18:52:07 +0000 (20:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 19:05:16 +0000 (21:05 +0200)
commitffed987a4d4afb8851d80b772eb9ee02cda20ef9
treec5eee86590050ef0cc5ae2ff7b57bf6a1de1e9fe
parent39e89f521159474a854927840e5a8cc4350ee587
parent7b734ee55dbb8476d7ad63c7daf55c534cf82d5d
Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'

* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
  lavf: Open PICT images with Quickdraw

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/img2.c