diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-02 00:59:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-02 00:59:35 +0200 |
| commit | cf942994489210c9509ae811cd4fc0515c872f09 (patch) | |
| tree | 5fd7e1c6f91a22898bc56d81d8ffe8fa95ba99a4 /presets | |
| parent | 21dc3a3cc23c624630a4379f08a6efe0230de37a (diff) | |
| parent | e337c9d56408dc00a15887309488a1ff5cb06ba3 (diff) | |
| download | ffmpeg-cf942994489210c9509ae811cd4fc0515c872f09.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Read h264 headers from v4l2 to allow stream-copying.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions