[FFmpeg-cvslog] Merge commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 12:17:12 2016 +0200| [c8b0d2eb8cba1b845886931fea346a2e8e82daa7] | committer: Clément Bœsch

Merge commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3'

* commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3':
  dds: Drop gray-alpha swapping

This commit is not merged, see 139cbeb75e0f5e3176b2b09660d2570b1bcc2408.

Merged-by: Clément Bœsch <clement at stupeflix.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8b0d2eb8cba1b845886931fea346a2e8e82daa7
---