• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 800ea20c
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    800ea20c
pcm-s16be 259 Bytes