diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 21:19:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 21:19:45 +0200 |
| commit | 0a512e347fb25baa17bde7d5347213695324dd9c (patch) | |
| tree | 5ebe056fb4e4942a85a4d6d4cd0ec27ff549af41 /libavfilter/vf_geq.c | |
| parent | cfaffb1ab7de383e8fe67add8ff42f0a2c52ff97 (diff) | |
| parent | 83affcde5124601a9dc6ad149bf5dbdb569fc10b (diff) | |
| download | ffmpeg-0a512e347fb25baa17bde7d5347213695324dd9c.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: use packet duration for subtitles if necessary.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_geq.c')
0 files changed, 0 insertions, 0 deletions