[FFmpeg-cvslog] Merge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  6 20:23:54 2015 +0200| [d423fc12e6e11f5d7792f8fd916fb10133862360] | committer: Michael Niedermayer

Merge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'

* commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162':
  quickdraw: Convert to bytestream2

Conflicts:
	libavcodec/qdrw.c

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

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