Michael Niedermayer 0a8e86faf2 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  Escape 130 FATE test

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-05-19 11:06:39 +02:00

..

acodec

lswr: Improve default resampler's default parameters

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

fate

Merge remote-tracking branch 'qatar/master'

2013-05-19 11:06:39 +02:00

lavf

sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input

2013-05-18 01:20:30 +02:00

lavf-fate

mp3dec: Fix VBR bit rate parsing

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

seek

avconv: make -t insert trim/atrim filters.

2013-04-30 11:53:12 +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