Changeset be8f96e5 in ffmpeg

Timestamp:

May 17, 2014, 1:13:05 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

aedc1c2e

Parents:

e2760de6 (diff), 34e2ce5 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (05/17/14 01:13:01)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/17/14 01:13:05)

Message:

Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'

• commit '34e2ce5dde073244ccb2b62f930e96fe612690f7': hlsenc: Set the default codecs to AAC and H264

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

(No files)