Skip to content
Snippets Groups Projects
Commit 3319679d authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'a1e05b04' 


* commit 'a1e05b04':
  lavfi: add trim and atrim filters.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1cba7fa3 a1e05b04
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 607 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment