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

..

acodec

lswr: Improve default resampler's default parameters

2013-01-04 16:47:57 +01:00

fate

Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'

2013-05-01 11:34:34 +02:00

lavf

avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer

2013-04-26 14:51:47 +02:00

lavf-fate

mp3dec: Fix VBR bit rate parsing

2013-03-05 13:06:01 +01:00

seek

avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer

2013-04-26 14:51:47 +02:00

vsynth

avcodec: rename prores encoders

2013-04-11 23:13:34 +02:00

vsynth1

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

vsynth2

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00