diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:30:48 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:30:48 +0200 |
| commit | 7255cf003ef17c5223d6748f25be592ba30933f0 (patch) | |
| tree | 02e7f6a63fb8f6a9fbb1ef16f4bddca0a946821c /ffserver.c | |
| parent | e490fee6b971f53061d0d21ba0dd79e8a30c7f34 (diff) | |
| parent | b5e4f393b6757629281f58c3f3f6d55ca522ab60 (diff) | |
| download | ffmpeg-streaming-7255cf003ef17c5223d6748f25be592ba30933f0.zip ffmpeg-streaming-7255cf003ef17c5223d6748f25be592ba30933f0.tar.gz | |
Merge commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60'
* commit 'b5e4f393b6757629281f58c3f3f6d55ca522ab60':
avconv: Make the private options discovery more manifest
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions
