mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-01-07 06:35:30 +01:00
Merge remote branch 'qatar/master'
* qatar/master: lavf: bump minor and add an APIChanges entry for avformat cleanup lavf: get rid of ffm-specific stuff in avformat.h Not pulled: avio: deprecate av_protocol_next(). avio: add a function for iterating though protocol names. lavf: rename a parameter of av_sdp_create from buff->buf lavf: rename avf_sdp_create to av_sdp_create. lavf: make av_guess_image2_codec internal avio: make URLProtocol internal. avio: make URLContext internal. lavf: mark av_pkt_dump(_log) for remove on $next+1 bump. lavf: use designated initializers for all protocols applehttp: don't use deprecated url_ functions. avio: move two ff_udp_* functions from avio_internal to url.h asfdec: remove a forgotten declaration of nonexistent function avio: deprecate the typedef for URLInterruptCB Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -505,13 +505,13 @@ http_get_file_handle(URLContext *h)
|
||||
}
|
||||
|
||||
URLProtocol ff_http_protocol = {
|
||||
"http",
|
||||
http_open,
|
||||
http_read,
|
||||
http_write,
|
||||
http_seek,
|
||||
http_close,
|
||||
.name = "http",
|
||||
.url_open = http_open,
|
||||
.url_read = http_read,
|
||||
.url_write = http_write,
|
||||
.url_seek = http_seek,
|
||||
.url_close = http_close,
|
||||
.url_get_file_handle = http_get_file_handle,
|
||||
.priv_data_size = sizeof(HTTPContext),
|
||||
.priv_data_class = &httpcontext_class,
|
||||
.priv_data_size = sizeof(HTTPContext),
|
||||
.priv_data_class = &httpcontext_class,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user