Changeset 4dc305d7 in ffmpeg

Timestamp:

Nov 17, 2014, 10:02:02 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e60c025e

Parents:

3fa4351d (diff), 40ed1cbf (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 '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'

• commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5': movenc: Allow writing a DASH sidx atom at the start of files

Conflicts:

libavformat/movenc.c

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

(No files)