Changeset dff205c in ffmpeg

Timestamp:

Aug 16, 2013, 11:43:31 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

50c08378

Parents:

83386a1 (diff), c9031c7 (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 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb'

• commit 'c9031c7c1446a1a63eff7c0bf50d1ee559adf3fb': hlsenc: Add a proper dependency on the mpegts muxer

Conflicts:

libavformat/Makefile

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

(No files)