Changeset 11ed7ec0 in ffmpeg

Timestamp:

Mar 12, 2014, 10:24:19 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

72d44f15

Parents:

b5c6b23a (diff), 6998a9f4 (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> (03/12/14 22:22:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/12/14 22:24:19)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: http: Properly initialize icy headers string

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

(No files)