Merge commit 'd0dce15da34c0e4eee6c683be299de0221db00d3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 18:38:15 +0000 (20:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 18:38:49 +0000 (20:38 +0200)
commit5d9873ecdab8d07c4f928d604a819756bb540e4b
treea18fb5b429e04e5221fbbc21dc891cc6cb819a7a
parentcb7c4f73e5e3debe2646279eaa7cfb493573118b
parentd0dce15da34c0e4eee6c683be299de0221db00d3
Merge commit 'd0dce15da34c0e4eee6c683be299de0221db00d3'

* commit 'd0dce15da34c0e4eee6c683be299de0221db00d3':
  quickdraw: Make the palette opaque

Conflicts:
libavcodec/qdrw.c

See: 9f9a1f424ed4db992f8a773b2eaad4941de3e9e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/qdrw.c