From c86d8aed748adc3ba8df96fb1fe14aa45da77a31 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sat, 28 Feb 2015 01:06:28 +0200 Subject: avio: Rename avclass symbols relating to avio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't prefix them ffio_url, which is misleading, sounding too much like the urlprotocol layer (like ffurl_*). Signed-off-by: Martin Storsjö --- libavformat/aviobuf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libavformat/aviobuf.c') 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; } -- cgit v1.2.3