diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 20:09:56 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 20:09:56 +0000 |
| commit | 00bd2374998856b71ff3ec50d3b6166f54d9601b (patch) | |
| tree | 139981aeeaaf3710d8003ae37057791fc360277b /ffserver_config.h | |
| parent | 4e3185d208666f151e442ba0e9509f1e97ad865e (diff) | |
| download | ffmpeg-streaming-00bd2374998856b71ff3ec50d3b6166f54d9601b.zip ffmpeg-streaming-00bd2374998856b71ff3ec50d3b6166f54d9601b.tar.gz | |
mov: Fix leftover merge conflict cruft
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'ffserver_config.h')
0 files changed, 0 insertions, 0 deletions
