Michael Niedermayer 3974889614 Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c' ...

* commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c':
  fate: Avoid unnecessary pixel format conversions

Conflicts:
	tests/fate/image.mak
	tests/ref/fate/dds-ya

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

2015-07-01 03:03:20 +02:00

..

acodec

avformat/rawenc: Store sample number for ADX

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

fate

Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'

2015-07-01 03:03:20 +02:00

lavf

lavf/riffenc: Set correct block align for mp2.

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

lavf-fate

…

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

…