Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 18:40:26 +0000 (20:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 18:40:26 +0000 (20:40 +0200)
commit39e89f521159474a854927840e5a8cc4350ee587
tree61d2639aeed50d2ae685700c4f58865f8ce15a81
parent251f9dcf225b2aac2181da3d7e05413483e1be74
parent34efb8a169e4551326e069be47125c6c2cb7ab90
Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90'

* commit '34efb8a169e4551326e069be47125c6c2cb7ab90':
  quickdraw: Support direct pixel blocks

Conflicts:
Changelog
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/qdrw.c
libavcodec/version.h