Commit 725b3da9 authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

Favor the term "URL" over "filename", as the API deals with URLs

rather than with simple filenames.

Originally committed as revision 21429 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c78295ad
...@@ -50,7 +50,7 @@ typedef struct URLContext { ...@@ -50,7 +50,7 @@ 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 max_packet_size; /**< if non zero, the stream is packetized with this max packet size */ int max_packet_size; /**< if non zero, the stream is packetized with this max packet size */
void *priv_data; void *priv_data;
char *filename; /**< specified filename */ char *filename; /**< specified URL */
} URLContext; } URLContext;
typedef struct URLPollEntry { typedef struct URLPollEntry {
...@@ -67,19 +67,19 @@ typedef int URLInterruptCB(void); ...@@ -67,19 +67,19 @@ typedef int URLInterruptCB(void);
/** /**
* Creates an URLContext for accessing to the resource indicated by * 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 * @param puc pointer to the location where, in case of success, the
* function puts the pointer to the created URLContext * 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 * is to be opened
* @return 0 in case of success, a negative value corresponding to an * @return 0 in case of success, a negative value corresponding to an
* AVERROR code in case of failure * AVERROR code in case of failure
*/ */
int url_open_protocol (URLContext **puc, struct URLProtocol *up, 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 * Reads up to size bytes from the resource accessed by h, and stores
...@@ -113,7 +113,7 @@ int64_t url_seek(URLContext *h, int64_t pos, int whence); ...@@ -113,7 +113,7 @@ int64_t url_seek(URLContext *h, int64_t pos, int whence);
*/ */
int url_close(URLContext *h); int url_close(URLContext *h);
int url_exist(const char *filename); int url_exist(const char *url);
int64_t url_filesize(URLContext *h); int64_t url_filesize(URLContext *h);
/** /**
...@@ -183,7 +183,7 @@ int64_t av_url_read_seek(URLContext *h, int stream_index, ...@@ -183,7 +183,7 @@ int64_t av_url_read_seek(URLContext *h, int stream_index,
typedef struct URLProtocol { typedef struct URLProtocol {
const char *name; 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_read)(URLContext *h, unsigned char *buf, int size);
int (*url_write)(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); int64_t (*url_seek)(URLContext *h, int64_t pos, int whence);
...@@ -383,7 +383,7 @@ int url_resetbuf(ByteIOContext *s, int flags); ...@@ -383,7 +383,7 @@ int url_resetbuf(ByteIOContext *s, int flags);
/** @note when opened as read/write, the buffers are only used for /** @note when opened as read/write, the buffers are only used for
writing */ 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); int url_fclose(ByteIOContext *s);
URLContext *url_fileno(ByteIOContext *s); URLContext *url_fileno(ByteIOContext *s);
......
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