Changeset 554a1ec in ffmpeg

Timestamp:

Apr 30, 2014, 7:29:04 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a1ac27bc

Parents:

5b4c8aac (diff), 7266e24f (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 '7266e24f176389d2e81bfc7c829934f7c8ae361c'

• commit '7266e24f176389d2e81bfc7c829934f7c8ae361c': hls: Sync the file number with the start sequence

Conflicts:

libavformat/hlsenc.c

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

(No files)