Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Aug 2013 11:43:05 +0000 (13:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Aug 2013 11:49:24 +0000 (13:49 +0200)
commit800ea20cadce7c5ec06e7821dc83dedb6e20209e
treed3400c82660ae2fa6f78776db2fec73aa1bd6ab2
parentc6f4a3a70837cf259466a7aab440dc0682b08c72
parent30ce289074e88f528965cb57720674a675639737
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>
26 files changed:
libavformat/movenc.c
libavformat/movenc.h
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/fate/sub-movtextenc
tests/ref/lavf/ismv
tests/ref/lavf/mov
tests/ref/vsynth/vsynth1-avui
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth1-prores
tests/ref/vsynth/vsynth1-prores_ks
tests/ref/vsynth/vsynth1-qtrle
tests/ref/vsynth/vsynth1-qtrlegray
tests/ref/vsynth/vsynth1-svq1
tests/ref/vsynth/vsynth2-avui
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-prores_ks
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-qtrlegray
tests/ref/vsynth/vsynth2-svq1