diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-01 03:00:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-01 03:08:04 +0200 |
| commit | 55ea31ab8981716a3ba1d2ae5521e62ff4494791 (patch) | |
| tree | 32357f472fffb499f40cc28861881c1d425daf87 /compat | |
| parent | 6d175158e914f042d4dc3a67688456cd0b9d8c62 (diff) | |
| parent | 25410c524ddee98c579c7a9ddaf0535278a6dae0 (diff) | |
| download | ffmpeg-55ea31ab8981716a3ba1d2ae5521e62ff4494791.tar.gz | |
Merge branch 'simple_http_server_api_implementation' of http://git.klaxa.eu/git/ffmpeg
Reviewed-by: Nicolas George <george@nsup.org>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions