Merge commit 'be4edda6'
* commit 'be4edda6': http: Expose the content location via an AVOption Conflicts: libavformat/http.c libavformat/version.h Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment