[FFmpeg-cvslog] Merge commit '0348e74c01a099a3787ae21df1c2a742fc846163'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 13 20:47:20 2015 +0200| [b6e8166a489d4c681e8a56483b9506d4f27e9ad0] | committer: Michael Niedermayer

Merge commit '0348e74c01a099a3787ae21df1c2a742fc846163'

* commit '0348e74c01a099a3787ae21df1c2a742fc846163':
  quickdraw: Skip the empty 512 byte header for images

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

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