diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 00:20:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-08 00:21:22 +0100 |
| commit | 6eb08783a97821e731e249d70bbb39eefabbf17f (patch) | |
| tree | 27120773d190b9c827c50077fefc5aaf8cb320f2 /ffserver.c | |
| parent | fabf69f37abe1560c85d6483f75849014da2971e (diff) | |
| parent | f87a6e500bcdaede22a123b81a2a46779cf7b71a (diff) | |
| download | ffmpeg-6eb08783a97821e731e249d70bbb39eefabbf17f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fic: Properly handle skip frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions