Changeset 42c8db69 in ffmpeg

Timestamp:

Nov 15, 2014, 10:52:43 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b08fd7ea

Parents:

f3c324a0 (diff), 8562c148 (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> (11/15/14 10:51:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/15/14 10:52:43)

Message:

Merge commit '8562c1483ba647f562e4c1df68a9231274b80e6b'

• commit '8562c1483ba647f562e4c1df68a9231274b80e6b': Icecast: Send content-type in all cases

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

(No files)