Merge commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 20:09:11 +0000 (20:09 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 20:09:11 +0000 (20:09 +0000)
commit11e6f13a13302dae18a1a83dac72fd9df0a69139
treeb70ed8f56f846a01150ecaef8e629ad994a49f7a
parente15e108885344b5cf8520a553ad93b742a95b6d3
parent55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c
Merge commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c'

This is a NOOP.

* commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c':
  riff: add C210 FourCC (Canopus C210)
  riff: add YUYV FourCC (Drastic YUYV)

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>