Changeset 800ea20c in ffmpeg

Timestamp:

Aug 23, 2013, 11:49:24 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

912ce9dd

Parents:

c6f4a3a7 (diff), 30ce2890 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (08/23/13 11:43:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/23/13 11:49:24)

Message:

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>

(No files)