Merge commit '4d8c28deab2488579f585406110b1be790896e59'

* commit '4d8c28deab2488579f585406110b1be790896e59': imgutils: make systematic palette opaque. Conflicts: libavutil/imgutils.c See: 4d8c28d Merged-by: Michael Niedermayer <[email protected]>
zhengxj91 · May 27, 2014 · e222cfe · e222cfe
2 parents e6a0846 + 4d8c28d
commit e222cfe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
@@ -181,7 +181,7 @@ int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt)
  default:
  return AVERROR(EINVAL);
  }
- pal[i] = b + (g<<8) + (r<<16) + (0xFFU<<24);
+ pal[i] = b + (g << 8) + (r << 16) + (0xFFU << 24);
  }
 
  return 0;