Merge commit '4d8c28deab2488579f585406110b1be790896e59'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 00:26:45 +0000 (02:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 00:27:35 +0000 (02:27 +0200)
* commit '4d8c28deab2488579f585406110b1be790896e59':
  imgutils: make systematic palette opaque.

Conflicts:
libavutil/imgutils.c

See: 4d8c28deab2488579f585406110b1be790896e59
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/imgutils.c

Simple merge