diff options
| author | Martin Storsjö <martin@martin.st> | 2015-02-28 01:06:28 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-02-28 22:07:04 +0200 |
| commit | c86d8aed748adc3ba8df96fb1fe14aa45da77a31 (patch) | |
| tree | 471e2c511712308759f86e4d24e6dd973a503bcd /libavformat | |
| parent | 82b6e451161f19ab90bfb9565b710021caf5dcbd (diff) | |
| download | ffmpeg-c86d8aed748adc3ba8df96fb1fe14aa45da77a31.tar.gz | |
avio: Rename avclass symbols relating to avio
Don't prefix them ffio_url, which is misleading, sounding too
much like the urlprotocol layer (like ffurl_*).
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio_internal.h | 2 | ||||
| -rw-r--r-- | libavformat/aviobuf.c | 16 | ||||
| -rw-r--r-- | libavformat/options.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index f8c9c93a3d..c8630ab66e 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -25,7 +25,7 @@ #include "libavutil/log.h" -extern const AVClass ffio_url_class; +extern const AVClass ff_avio_class; int ffio_init_context(AVIOContext *s, unsigned char *buffer, diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 8dc805a3ae..fb941c6e62 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -40,28 +40,28 @@ */ #define SHORT_SEEK_THRESHOLD 4096 -static void *ffio_url_child_next(void *obj, void *prev) +static void *ff_avio_child_next(void *obj, void *prev) { AVIOContext *s = obj; return prev ? NULL : s->opaque; } -static const AVClass *ffio_url_child_class_next(const AVClass *prev) +static const AVClass *ff_avio_child_class_next(const AVClass *prev) { return prev ? NULL : &ffurl_context_class; } -static const AVOption ffio_url_options[] = { +static const AVOption ff_avio_options[] = { { NULL }, }; -const AVClass ffio_url_class = { +const AVClass ff_avio_class = { .class_name = "AVIOContext", .item_name = av_default_item_name, .version = LIBAVUTIL_VERSION_INT, - .option = ffio_url_options, - .child_next = ffio_url_child_next, - .child_class_next = ffio_url_child_class_next, + .option = ff_avio_options, + .child_next = ff_avio_child_next, + .child_class_next = ff_avio_child_class_next, }; static void fill_buffer(AVIOContext *s); @@ -703,7 +703,7 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) (*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause; (*s)->read_seek = (int64_t (*)(void *, int, int64_t, int))h->prot->url_read_seek; } - (*s)->av_class = &ffio_url_class; + (*s)->av_class = &ff_avio_class; return 0; } diff --git a/libavformat/options.c b/libavformat/options.c index 227c36f95f..996dc31274 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -55,7 +55,7 @@ static const AVClass *format_child_class_next(const AVClass *prev) AVOutputFormat *ofmt = NULL; if (!prev) - return &ffio_url_class; + return &ff_avio_class; while ((ifmt = av_iformat_next(ifmt))) if (ifmt->priv_class == prev) |