* 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>
		
			
				
	
	
		
			5 lines
		
	
	
		
			243 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			5 lines
		
	
	
		
			243 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| 8d9fb9f5433962e7880b666e6e2e428e *tests/data/fate/acodec-alac.mov
 | |
| 389018 tests/data/fate/acodec-alac.mov
 | |
| 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-alac.out.wav
 | |
| stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
 |