Michael Niedermayer 800ea20cad Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  movenc: Make tkhd "enabled" flag QuickTime compatible

Conflicts:
	libavformat/movenc.c
	tests/ref/acodec/alac
	tests/ref/acodec/pcm-s16be
	tests/ref/acodec/pcm-s24be
	tests/ref/acodec/pcm-s32be
	tests/ref/acodec/pcm-s8
	tests/ref/lavf/mov
	tests/ref/vsynth/vsynth1-dnxhd-1080i
	tests/ref/vsynth/vsynth1-mpeg4
	tests/ref/vsynth/vsynth1-prores
	tests/ref/vsynth/vsynth1-qtrle
	tests/ref/vsynth/vsynth1-svq1
	tests/ref/vsynth/vsynth2-dnxhd-1080i
	tests/ref/vsynth/vsynth2-mpeg4
	tests/ref/vsynth/vsynth2-prores
	tests/ref/vsynth/vsynth2-qtrle
	tests/ref/vsynth/vsynth2-svq1

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

2013-08-23 13:49:24 +02:00

..

vsynth1-amv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-asv1

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth1-asv2

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth1-avui

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth1-cljr

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-dnxhd_1080i

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-dnxhd-720p

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-dnxhd-720p-10bit

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-dnxhd-720p-rd

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-dnxhd-1080i

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth1-dv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-dv_411

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-dv-50

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-dv-411

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-ffv1

FATE: enable multiple slices in the ffv1 vsynth test

2013-03-08 08:10:52 +01:00

vsynth1-ffv1.0

fate: add ffv1.0 test

2013-08-18 13:01:44 +02:00

vsynth1-ffvhuff

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-flashsv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-flashsv2

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-flv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-h261

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-h263

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-h263-obmc

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-h263p

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-huffyuv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-jpeg2000

j2k/jpeg2000dec: merge

2013-05-31 03:10:08 +02:00

vsynth1-jpeg2000-97

avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 int IDWT

2013-06-03 13:24:20 +02:00

vsynth1-jpegls

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-ljpeg

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth1-mjpeg

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mjpeg-422

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mjpeg-444

mjpegenc: fix 444 block count so it is below 10

2012-12-16 15:05:31 +01:00

vsynth1-mpeg1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg1b

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg2

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg2-422

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg2-idct-int

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth1-mpeg2-ilace

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg2-ivlc-qprd

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg2-thread

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg2-thread-ivlc

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg4

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth1-mpeg4-adap

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg4-adv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg4-error

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg4-nr

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg4-qpel

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg4-qprd

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg4-rc

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpeg4-thread

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-mpng

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-msmpeg4

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-msmpeg4v2

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-msvideo1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-prores

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth1-prores_ks

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth1-qtrle

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth1-qtrlegray

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth1-r210

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-rgb

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-roqvideo

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth1-rv10

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-rv20

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-snow

Drop Snow codec

2013-01-06 16:30:02 +01:00

vsynth1-snow-hpel

Drop Snow codec

2013-01-06 16:30:02 +01:00

vsynth1-snow-ll

Drop Snow codec

2013-01-06 16:30:02 +01:00

vsynth1-svq1

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth1-v210

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth1-v308

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-v408

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-wmv1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-wmv2

Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'

2013-01-21 16:07:21 +01:00

vsynth1-y41p

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-yuv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-yuv4

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-zlib

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth1-zmbv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-amv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-asv1

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth2-asv2

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth2-avui

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth2-cljr

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dnxhd_1080i

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dnxhd-720p

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dnxhd-720p-10bit

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dnxhd-720p-rd

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dnxhd-1080i

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth2-dv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dv_411

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dv-50

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dv-411

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-ffv1

FATE: enable multiple slices in the ffv1 vsynth test

2013-03-08 08:10:52 +01:00

vsynth2-ffv1.0

fate: add ffv1.0 test

2013-08-18 13:01:44 +02:00

vsynth2-ffvhuff

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-flashsv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-flashsv2

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-flv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-h261

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-h263

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-h263-obmc

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-h263p

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-huffyuv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-jpeg2000

j2k/jpeg2000dec: merge

2013-05-31 03:10:08 +02:00

vsynth2-jpeg2000-97

avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 int IDWT

2013-06-03 13:24:20 +02:00

vsynth2-jpegls

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-ljpeg

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth2-mjpeg

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mjpeg-422

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mjpeg-444

mjpegenc: fix 444 block count so it is below 10

2012-12-16 15:05:31 +01:00

vsynth2-mpeg1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg1b

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-422

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-idct-int

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth2-mpeg2-ilace

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-ivlc-qprd

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth2-mpeg2-thread

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-thread-ivlc

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth2-mpeg4-adap

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-adv

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth2-mpeg4-error

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-nr

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-qpel

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-qprd

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-rc

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-thread

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpng

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-msmpeg4

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-msmpeg4v2

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-msvideo1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-prores

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth2-prores_ks

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth2-qtrle

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth2-qtrlegray

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth2-r210

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-rgb

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-roqvideo

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth2-rv10

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-rv20

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-snow

Drop Snow codec

2013-01-06 16:30:02 +01:00

vsynth2-snow-hpel

Drop Snow codec

2013-01-06 16:30:02 +01:00

vsynth2-snow-ll

Drop Snow codec

2013-01-06 16:30:02 +01:00

vsynth2-svq1

Merge remote-tracking branch 'qatar/master'

2013-08-23 13:49:24 +02:00

vsynth2-v210

fate: move vsynth reference files to their own directory

2012-12-03 00:36:10 +01:00

vsynth2-v308

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-v408

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-wmv1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-wmv2

Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'

2013-01-21 16:07:21 +01:00

vsynth2-y41p

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-yuv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-yuv4

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-zlib

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-zmbv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00