# HG changeset patch # User stefano # Date 1264357083 0 # Node ID 333f55aab3a27a99b4274675618a82d009dd0431 # Parent 70488b6f70440d594e5c295e2ed9a1e6f1ebd70d Favor the term "URL" over "filename", as the API deals with URLs rather than with simple filenames. diff -r 70488b6f7044 -r 333f55aab3a2 avio.h --- a/avio.h Sun Jan 24 18:09:46 2010 +0000 +++ b/avio.h Sun Jan 24 18:18:03 2010 +0000 @@ -50,7 +50,7 @@ int is_streamed; /**< true if streamed (no seek possible), default = false */ int max_packet_size; /**< if non zero, the stream is packetized with this max packet size */ void *priv_data; - char *filename; /**< specified filename */ + char *filename; /**< specified URL */ } URLContext; typedef struct URLPollEntry { @@ -67,19 +67,19 @@ /** * Creates an URLContext for accessing to the resource indicated by - * filename, and opens it using the URLProtocol up. + * url, and opens it using the URLProtocol up. * * @param puc pointer to the location where, in case of success, the * function puts the pointer to the created URLContext - * @param flags flags which control how the resource indicated by filename + * @param flags flags which control how the resource indicated by url * is to be opened * @return 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ int url_open_protocol (URLContext **puc, struct URLProtocol *up, - const char *filename, int flags); + const char *url, int flags); -int url_open(URLContext **h, const char *filename, int flags); +int url_open(URLContext **h, const char *url, int flags); /** * Reads up to size bytes from the resource accessed by h, and stores @@ -113,7 +113,7 @@ */ int url_close(URLContext *h); -int url_exist(const char *filename); +int url_exist(const char *url); int64_t url_filesize(URLContext *h); /** @@ -183,7 +183,7 @@ typedef struct URLProtocol { const char *name; - int (*url_open)(URLContext *h, const char *filename, int flags); + 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, unsigned char *buf, int size); int64_t (*url_seek)(URLContext *h, int64_t pos, int whence); @@ -383,7 +383,7 @@ /** @note when opened as read/write, the buffers are only used for writing */ -int url_fopen(ByteIOContext **s, const char *filename, int flags); +int url_fopen(ByteIOContext **s, const char *url, int flags); int url_fclose(ByteIOContext *s); URLContext *url_fileno(ByteIOContext *s);