diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 14:08:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 14:09:15 +0200 |
| commit | 61c6e69709ca202bfd1df6b0c651c79a9b8e7622 (patch) | |
| tree | c2c513d938a1e5687a09155ca832d79c6df169d7 /tests/ffserver.conf | |
| parent | 1dd38e99fd1263f112825045eb69a6b041d5bc97 (diff) | |
| parent | c92965dbfbb7e2b49df14db2fd0e23a29295730a (diff) | |
| download | ffmpeg-61c6e69709ca202bfd1df6b0c651c79a9b8e7622.tar.gz | |
Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'
* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
avconv: check return value
Conflicts:
ffmpeg.c
See: 4930cd13d634d5f4e284de3a955d5c6a84fd65e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver.conf')
0 files changed, 0 insertions, 0 deletions