Changeset f3c324a0 in ffmpeg

Timestamp:

Nov 15, 2014, 10:30:42 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

42c8db69

Parents:

05e4b25e (diff), 3a6bb973 (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:28:06)

git-committer:

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

Message:

Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'

• commit '3a6bb9735053c453f806ceab1d91124648d90aca': Icecast: Send 100-continue header if possible

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

(No files)