diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 14:35:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 17:24:43 +0200 |
| commit | 4818388e6c219bf48fa93bf76ee6ab3dc3fb1e8f (patch) | |
| tree | 22186855dca520f96dc3ec539ea387eabebab4a9 /libswscale/swscale_internal.h | |
| parent | 76c1f9200fa3bf16a47042c0c2a1bd11e408b56c (diff) | |
| parent | 8cd472d3f947a6233e7dc628f0dc71c74e62413a (diff) | |
Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'
* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a':
avconv: make output -ss insert trim/atrim filters.
Conflicts:
Changelog
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
0 files changed, 0 insertions, 0 deletions