diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 21:00:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 21:00:26 +0200 |
| commit | 909757fabdf8d7f9360a06a81625a58a5ec3e05c (patch) | |
| tree | 897fabb84050e664bb46aadc47f796123f7badc7 /ffserver.c | |
| parent | 3b37f2286199ccec7e30b74c56b975e1e4e77739 (diff) | |
| parent | 66d04c068a30751750818dcfbb6555ab74eb3f6d (diff) | |
| download | ffmpeg-909757fabdf8d7f9360a06a81625a58a5ec3e05c.tar.gz | |
Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'
* commit '66d04c068a30751750818dcfbb6555ab74eb3f6d':
fate: Explicitly use gray16le in fate-sgi-gray16
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions