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)
* commit 'd0dce15da34c0e4eee6c683be299de0221db00d3':
  quickdraw: Make the palette opaque

Conflicts:
libavcodec/qdrw.c

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

Simple merge