diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:09:11 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 20:09:11 +0000 |
| commit | 11e6f13a13302dae18a1a83dac72fd9df0a69139 (patch) | |
| tree | b70ed8f56f846a01150ecaef8e629ad994a49f7a /libavcodec/g722dec.c | |
| parent | e15e108885344b5cf8520a553ad93b742a95b6d3 (diff) | |
| parent | 55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c (diff) | |
| download | ffmpeg-11e6f13a13302dae18a1a83dac72fd9df0a69139.tar.gz | |
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>
Diffstat (limited to 'libavcodec/g722dec.c')
0 files changed, 0 insertions, 0 deletions