Merge commit '7bc780cd4413f688d3b834037b0f9ddfd6948140'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 15:11:06 +0000 (15:11 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 15:11:06 +0000 (15:11 +0000)
commit63c3e35332838fca19b7ffdae13233b0f3759402
tree020d2f04eb2de6bf54a52770a954bc5873462f2f
parent9f2c1c77d2098168761421febbbdb0abf0fd6cce
parent7bc780cd4413f688d3b834037b0f9ddfd6948140
Merge commit '7bc780cd4413f688d3b834037b0f9ddfd6948140'

* commit '7bc780cd4413f688d3b834037b0f9ddfd6948140':
  pixfmt: add a CUDA hwaccelled format

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h