4 Commits

Author	SHA1	Message	Date
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
John Stebbins	30ce289074	movenc: Make tkhd "enabled" flag QuickTime compatible ... QuickTime will play multiple audio tracks concurrently if this flag is set for multiple audio tracks. And if no subtitle track has this flag set, QuickTime will show no subtitles in the subtitle menu. Signed-off-by: Anton Khirnov <anton@khirnov.net>	2013-08-23 09:55:42 +02:00
Michael Niedermayer	7711f19eda	Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6' ... * commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6': fate-seek: remove use of gnu make 3.82 only private modifier fate: move vsynth reference files to their own directory fate: move fate-acodec reference files to their own dir configure: avplay now depends on avresample fate: split dependencies for fate-seek tests Conflicts: configure tests/fate/seek.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-12-03 02:33:27 +01:00
Janne Grunau	c8148e5c93	fate: move vsynth reference files to their own directory	2012-12-03 00:36:10 +01:00