aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-18 08:08:13 +0200
committerMax Kellermann <max@duempel.org>2008-10-18 08:08:13 +0200
commit1dfe92057e546b087b9dcfcfa260e3282e1a195c (patch)
treec02c396b114d5c70de1e898aac6c546f4719b995
parent90fdf07aa9399459a08b7570cce388d2810b33ff (diff)
downloadmpd-1dfe92057e546b087b9dcfcfa260e3282e1a195c.tar.gz
mpd-1dfe92057e546b087b9dcfcfa260e3282e1a195c.tar.xz
mpd-1dfe92057e546b087b9dcfcfa260e3282e1a195c.zip
ffmpeg: make internal functions static
The mpdurl_* code is internal, don't expose them. Also don't initialize struct members with NULL.
-rw-r--r--src/inputPlugins/ffmpeg_plugin.c34
1 files changed, 12 insertions, 22 deletions
diff --git a/src/inputPlugins/ffmpeg_plugin.c b/src/inputPlugins/ffmpeg_plugin.c
index a9b69f298..7d3c24360 100644
--- a/src/inputPlugins/ffmpeg_plugin.c
+++ b/src/inputPlugins/ffmpeg_plugin.c
@@ -48,25 +48,7 @@ typedef struct {
InputStream *input;
} FopsHelper;
-int mpdurl_open(URLContext *h, const char *filename, int flags);
-int mpdurl_read(URLContext *h, unsigned char *buf, int size);
-int64_t mpdurl_seek(URLContext *h, int64_t pos, int whence);
-int mpdurl_close(URLContext *h);
-
-URLProtocol mpdurl_fileops = {
- .name = "mpd",
- .url_open = mpdurl_open,
- .url_read = mpdurl_read,
- .url_write = NULL,
- .url_seek = mpdurl_seek,
- .url_close = mpdurl_close,
- .next = NULL,
- .url_read_pause = NULL,
- .url_read_seek = NULL
-};
-
-
-int mpdurl_open(URLContext *h, const char *filename, int flags)
+static int mpdurl_open(URLContext *h, const char *filename, int flags)
{
uint32_t ptr;
FopsHelper *base;
@@ -84,7 +66,7 @@ int mpdurl_open(URLContext *h, const char *filename, int flags)
return -1;
}
-int mpdurl_read(URLContext *h, unsigned char *buf, int size)
+static int mpdurl_read(URLContext *h, unsigned char *buf, int size)
{
int ret;
FopsHelper *base = (FopsHelper *) h->priv_data;
@@ -107,7 +89,7 @@ int mpdurl_read(URLContext *h, unsigned char *buf, int size)
return ret;
}
-int64_t mpdurl_seek(URLContext *h, int64_t pos, int whence)
+static int64_t mpdurl_seek(URLContext *h, int64_t pos, int whence)
{
FopsHelper *base = (FopsHelper *) h->priv_data;
if (whence != AVSEEK_SIZE) { //only ftell
@@ -116,7 +98,7 @@ int64_t mpdurl_seek(URLContext *h, int64_t pos, int whence)
return base->input->offset;
}
-int mpdurl_close(URLContext *h)
+static int mpdurl_close(URLContext *h)
{
FopsHelper *base = (FopsHelper *) h->priv_data;
if (base && base->input->seekable) {
@@ -126,6 +108,14 @@ int mpdurl_close(URLContext *h)
return 0;
}
+static URLProtocol mpdurl_fileops = {
+ .name = "mpd",
+ .url_open = mpdurl_open,
+ .url_read = mpdurl_read,
+ .url_seek = mpdurl_seek,
+ .url_close = mpdurl_close,
+};
+
static int ffmpeg_init(void)
{
av_register_all();