diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 11:26:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 11:34:34 +0200 |
| commit | 3319679d0a36bec3e78f639d6f9fbbe596f6eec3 (patch) | |
| tree | 77d6f0a7a0280252793d2462ff5be86dcf4a9cd4 /ffmpeg_opt.c | |
| parent | 1cba7fa364a9c95773d779ff5d5602be8391310e (diff) | |
| parent | a1e05b0487a1939334c2920fc7f9936bc9efe876 (diff) | |
| download | android_external_ffmpeg-3319679d0a36bec3e78f639d6f9fbbe596f6eec3.tar.gz android_external_ffmpeg-3319679d0a36bec3e78f639d6f9fbbe596f6eec3.tar.bz2 android_external_ffmpeg-3319679d0a36bec3e78f639d6f9fbbe596f6eec3.zip | |
Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
lavfi: add trim and atrim filters.
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions