Changeset 5b4c8aac in ffmpeg

Timestamp:

Apr 30, 2014, 7:14:56 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

554a1ec

Parents:

8522dd38 (diff), a1643103 (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 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5'

• commit 'a16431034d9bd44182bf844d6bbde2c98bc4e6b5': hls: Factor the sequence computation

Conflicts:

libavformat/hlsenc.c

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

(No files)