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

..

adpcm_ima_qt

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

adpcm-adx

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

adpcm-ima_qt

aiffenc: set correct number of bits foru8 in aiff

2012-12-20 16:05:30 +01:00

adpcm-ima_wav

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

adpcm-ms

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

adpcm-swf

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

adpcm-yamaha

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

alac

Merge remote-tracking branch 'qatar/master'

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

flac

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

g723_1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

mp2

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

pcm-alaw

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

pcm-f32be

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-f32le

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

pcm-f64be

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-f64le

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

pcm-mulaw

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

pcm-s8

Merge remote-tracking branch 'qatar/master'

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

pcm-s8_planar

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-s16be

Merge remote-tracking branch 'qatar/master'

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

pcm-s16be_planar

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-s16le

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

pcm-s16le_planar

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-s24be

Merge remote-tracking branch 'qatar/master'

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

pcm-s24le

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

pcm-s24le_planar

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-s32be

Merge remote-tracking branch 'qatar/master'

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

pcm-s32le

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

pcm-s32le_planar

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-u8

fate: move fate-acodec reference files to their own dir

2012-12-03 00:29:35 +01:00

pcm-u16be

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-u16le

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-u24be

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-u24le

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-u32be

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

pcm-u32le

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

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

roqaudio

lswr: Improve default resampler's default parameters

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