Changeset 15b2ec57 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9440e470

Parents:

1d19f1b1 (diff), be4edda6 (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.

Message:

Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'

• commit 'be4edda6731a341d3fdeaa0e57753dc396790362': http: Expose the content location via an AVOption

Conflicts:

libavformat/http.c
libavformat/version.h

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

(No files)