Merge branch 'simple_http_server_api_implementation' of http://git.klaxa.eu/git/ffmpeg
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 1 Aug 2015 01:00:01 +0000 (03:00 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 1 Aug 2015 01:08:04 +0000 (03:08 +0200)
Reviewed-by: Nicolas George <george@nsup.org>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Trivial merge