diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 21:09:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 21:18:13 +0200 |
| commit | c5fc48fdfb7636e62681d75a33d1a27abcb90a67 (patch) | |
| tree | bea75bb1cb28e34a35297b7108166c4cb9233a1a /ffserver.c | |
| parent | 8ce321f0aaa96226c9294481403e7dc0f10c002e (diff) | |
| parent | 07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0 (diff) | |
| download | ffmpeg-c5fc48fdfb7636e62681d75a33d1a27abcb90a67.tar.gz | |
Merge commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0'
* commit '07b2db81d06e1cd6b1718d3e2dd7a42e8bccf8c0':
riff: Add MNM4 FourCC as mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions