1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Michael Niedermayer 3319679d0a 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>
2013-05-01 11:34:34 +02:00
..
2013-04-25 23:23:12 +02:00
2013-03-05 11:44:58 +00:00
2013-04-30 11:06:03 +02:00