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
adpcm-adx
adpcm-ima_qt
adpcm-ima_wav
adpcm-ms
adpcm-swf
adpcm-yamaha
alac	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
flac
g723_1
mp2
pcm-alaw
pcm-f32be
pcm-f32le
pcm-f64be
pcm-f64le
pcm-mulaw
pcm-s8	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
pcm-s8_planar
pcm-s16be	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
pcm-s16be_planar
pcm-s16le
pcm-s16le_planar
pcm-s24be	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
pcm-s24le
pcm-s24le_planar
pcm-s32be	Merge remote-tracking branch 'qatar/master'	2013-08-23 13:49:24 +02:00
pcm-s32le
pcm-s32le_planar
pcm-u8
pcm-u16be
pcm-u16le
pcm-u24be
pcm-u24le
pcm-u32be
pcm-u32le
roqaudio