Changeset 8522dd38 in ffmpeg

Timestamp:
Apr 30, 2014, 6:52:58 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
5b4c8aac
Parents:
67979b59 (diff), c7603b3 (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 'c7603b3c243331057300337a61464e6ac4a605cb'

Conflicts:

libavformat/hlsenc.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.