Commit 5593f031 authored by Anton Khirnov's avatar Anton Khirnov
Browse files

avio: make URLProtocol internal.

parent c486dade
...@@ -139,8 +139,11 @@ attribute_deprecated int url_poll(URLPollEntry *poll_table, int n, int timeout); ...@@ -139,8 +139,11 @@ attribute_deprecated int url_poll(URLPollEntry *poll_table, int n, int timeout);
#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */ #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */
#endif
/**
* @deprecated This struct is to be made private. Use the higher-level
* AVIOContext-based API instead.
*/
typedef struct URLProtocol { typedef struct URLProtocol {
const char *name; const char *name;
int (*url_open)(URLContext *h, const char *url, int flags); int (*url_open)(URLContext *h, const char *url, int flags);
...@@ -157,6 +160,7 @@ typedef struct URLProtocol { ...@@ -157,6 +160,7 @@ typedef struct URLProtocol {
const AVClass *priv_data_class; const AVClass *priv_data_class;
int flags; int flags;
} URLProtocol; } URLProtocol;
#endif
#if FF_API_REGISTER_PROTOCOL #if FF_API_REGISTER_PROTOCOL
extern URLProtocol *first_protocol; extern URLProtocol *first_protocol;
......
...@@ -43,6 +43,23 @@ typedef struct URLContext { ...@@ -43,6 +43,23 @@ typedef struct URLContext {
int is_streamed; /**< true if streamed (no seek possible), default = false */ int is_streamed; /**< true if streamed (no seek possible), default = false */
int is_connected; int is_connected;
} URLContext; } URLContext;
typedef struct URLProtocol {
const char *name;
int (*url_open)( URLContext *h, const char *url, int flags);
int (*url_read)( URLContext *h, unsigned char *buf, int size);
int (*url_write)(URLContext *h, const unsigned char *buf, int size);
int64_t (*url_seek)( URLContext *h, int64_t pos, int whence);
int (*url_close)(URLContext *h);
struct URLProtocol *next;
int (*url_read_pause)(URLContext *h, int pause);
int64_t (*url_read_seek)(URLContext *h, int stream_index,
int64_t timestamp, int flags);
int (*url_get_file_handle)(URLContext *h);
int priv_data_size;
const AVClass *priv_data_class;
int flags;
} URLProtocol;
#endif #endif
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment