[FFmpeg-cvslog] Merge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f'

[Michael Niedermayer]

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

Merge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f'

* commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f':
  quickdraw: Switch to greedy parsing

Conflicts:
	libavcodec/qdrw.c

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

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