Michael Niedermayer 5142963b7d Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721' ...

* commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721':
  g2meet: force simple idct for identical results over all fate configs

Conflicts:
	tests/ref/fate/g2m3
	tests/ref/fate/g2m4

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

2015-07-01 19:31:34 +02:00

..

acodec

avformat/rawenc: Store sample number for ADX

2015-06-21 12:16:24 +02:00

fate

Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'

2015-07-01 19:31:34 +02:00

lavf

lavf/riffenc: Set correct block align for mp2.

2015-06-04 17:03:34 +02:00

lavf-fate

Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'

2014-10-24 15:30:12 +02:00

seek

lavf: Replace the ASF demuxer

2015-06-28 10:16:40 +02:00

vsynth

mov: Preserve the metadata even when bit-exactness is requested

2015-06-30 15:34:38 +02:00

vsynth1

…

vsynth_lena

tests: Rename vsynth2 to vsynth_lena

2014-12-02 03:02:30 +01:00