Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 09:26:53 +0000 (11:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 May 2013 09:34:34 +0000 (11:34 +0200)
commit3319679d0a36bec3e78f639d6f9fbbe596f6eec3
tree77d6f0a7a0280252793d2462ff5be86dcf4a9cd4
parent1cba7fa364a9c95773d779ff5d5602be8391310e
parenta1e05b0487a1939334c2920fc7f9936bc9efe876
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>
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/trim.c
tests/fate/filter-audio.mak
tests/fate/filter-video.mak