[FFmpeg-cvslog] Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  6 20:52:07 2015 +0200| [ffed987a4d4afb8851d80b772eb9ee02cda20ef9] | committer: Michael Niedermayer

Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'

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

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffed987a4d4afb8851d80b772eb9ee02cda20ef9
---