Changeset 375d7ee8 in ffmpeg

Timestamp:

Jul 11, 2014, 11:07:26 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4932b1e8

Parents:

4c915994 (diff), df2aa222 (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.

Message:

Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'

• commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e': mov: Clarify tkhd flag settings

Conflicts:

libavformat/movenc.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)