aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver_config.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 18:51:58 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 18:51:58 +0100
commit1117d6f4b122aa4189c27e3568154e029dfdcbe7 (patch)
treea42e3d85e5cbf7eedb3505e8ea9126b7caf2c6d4 /ffserver_config.c
parent98e3153fa3a190df5c0a2173e134f81299606819 (diff)
parent6202e2fede75df92cbc374a3f7d6893d0c5ac721 (diff)
downloadffmpeg-1117d6f4b122aa4189c27e3568154e029dfdcbe7.tar.gz
Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'
* commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721': indeo4: Rework stream analysis report Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'ffserver_config.c')
0 files changed, 0 insertions, 0 deletions