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
vsynth1-asv1
vsynth1-asv2
vsynth1-avui	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
vsynth1-cljr
vsynth1-dnxhd_1080i
vsynth1-dnxhd-720p
vsynth1-dnxhd-720p-10bit
vsynth1-dnxhd-720p-rd
vsynth1-dnxhd-1080i	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
vsynth1-dv
vsynth1-dv_411
vsynth1-dv-50
vsynth1-dv-411
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
vsynth1-flashsv
vsynth1-flashsv2
vsynth1-flv
vsynth1-h261
vsynth1-h263
vsynth1-h263-obmc
vsynth1-h263p
vsynth1-huffyuv
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
vsynth1-ljpeg
vsynth1-mjpeg
vsynth1-mjpeg-422
vsynth1-mjpeg-444
vsynth1-mpeg1
vsynth1-mpeg1b
vsynth1-mpeg2
vsynth1-mpeg2-422
vsynth1-mpeg2-idct-int
vsynth1-mpeg2-ilace
vsynth1-mpeg2-ivlc-qprd
vsynth1-mpeg2-thread
vsynth1-mpeg2-thread-ivlc
vsynth1-mpeg4	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
vsynth1-mpeg4-adap
vsynth1-mpeg4-adv
vsynth1-mpeg4-error
vsynth1-mpeg4-nr
vsynth1-mpeg4-qpel
vsynth1-mpeg4-qprd
vsynth1-mpeg4-rc
vsynth1-mpeg4-thread
vsynth1-mpng
vsynth1-msmpeg4
vsynth1-msmpeg4v2
vsynth1-msvideo1
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
vsynth1-rgb
vsynth1-roqvideo
vsynth1-rv10
vsynth1-rv20
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
vsynth1-v308
vsynth1-v408
vsynth1-wmv1
vsynth1-wmv2	Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'	2013-01-21 16:07:21 +01:00
vsynth1-y41p
vsynth1-yuv
vsynth1-yuv4
vsynth1-zlib
vsynth1-zmbv
vsynth2-amv
vsynth2-asv1
vsynth2-asv2
vsynth2-avui	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
vsynth2-cljr
vsynth2-dnxhd_1080i
vsynth2-dnxhd-720p
vsynth2-dnxhd-720p-10bit
vsynth2-dnxhd-720p-rd
vsynth2-dnxhd-1080i	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
vsynth2-dv
vsynth2-dv_411
vsynth2-dv-50
vsynth2-dv-411
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
vsynth2-flashsv
vsynth2-flashsv2
vsynth2-flv
vsynth2-h261
vsynth2-h263
vsynth2-h263-obmc
vsynth2-h263p
vsynth2-huffyuv
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
vsynth2-ljpeg
vsynth2-mjpeg
vsynth2-mjpeg-422
vsynth2-mjpeg-444
vsynth2-mpeg1
vsynth2-mpeg1b
vsynth2-mpeg2
vsynth2-mpeg2-422
vsynth2-mpeg2-idct-int
vsynth2-mpeg2-ilace
vsynth2-mpeg2-ivlc-qprd
vsynth2-mpeg2-thread
vsynth2-mpeg2-thread-ivlc
vsynth2-mpeg4	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
vsynth2-mpeg4-adap
vsynth2-mpeg4-adv
vsynth2-mpeg4-error
vsynth2-mpeg4-nr
vsynth2-mpeg4-qpel
vsynth2-mpeg4-qprd
vsynth2-mpeg4-rc
vsynth2-mpeg4-thread
vsynth2-mpng
vsynth2-msmpeg4
vsynth2-msmpeg4v2
vsynth2-msvideo1
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
vsynth2-rgb
vsynth2-roqvideo
vsynth2-rv10
vsynth2-rv20
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
vsynth2-v308
vsynth2-v408
vsynth2-wmv1
vsynth2-wmv2	Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'	2013-01-21 16:07:21 +01:00
vsynth2-y41p
vsynth2-yuv
vsynth2-yuv4
vsynth2-zlib
vsynth2-zmbv