[FFmpeg-cvslog] Merge commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c'

Derek Buitenhuis git at videolan.org
Wed Jan 27 21:09:30 CET 2016


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Jan 27 20:09:11 2016 +0000| [11e6f13a13302dae18a1a83dac72fd9df0a69139] | committer: Derek Buitenhuis

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 at gmail.com>

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





More information about the ffmpeg-cvslog mailing list