Changeset 1d19f1b1 in ffmpeg

Timestamp:

Nov 22, 2013, 4:41:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

15b2ec57

Parents:

45ab71a8 (diff), 393d80cc (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/22/13 16:26:03)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/22/13 16:41:45)

Message:

Merge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33'

• commit '393d80cc278e2b2f5c9e7805db176e6f28335a33': http: Support relative URL redirection

Conflicts:

libavformat/http.c

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

(No files)