Browse Source

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>
tags/n2.6
Martin Storsjö 10 years ago
parent
commit
c86d8aed74
3 changed files with 10 additions and 10 deletions
  1. +1
    -1
      libavformat/avio_internal.h
  2. +8
    -8
      libavformat/aviobuf.c
  3. +1
    -1
      libavformat/options.c

+ 1
- 1
libavformat/avio_internal.h View File

@@ -25,7 +25,7 @@


#include "libavutil/log.h" #include "libavutil/log.h"


extern const AVClass ffio_url_class;
extern const AVClass ff_avio_class;


int ffio_init_context(AVIOContext *s, int ffio_init_context(AVIOContext *s,
unsigned char *buffer, unsigned char *buffer,


+ 8
- 8
libavformat/aviobuf.c View File

@@ -40,28 +40,28 @@
*/ */
#define SHORT_SEEK_THRESHOLD 4096 #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; AVIOContext *s = obj;
return prev ? NULL : s->opaque; 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; return prev ? NULL : &ffurl_context_class;
} }


static const AVOption ffio_url_options[] = {
static const AVOption ff_avio_options[] = {
{ NULL }, { NULL },
}; };


const AVClass ffio_url_class = {
const AVClass ff_avio_class = {
.class_name = "AVIOContext", .class_name = "AVIOContext",
.item_name = av_default_item_name, .item_name = av_default_item_name,
.version = LIBAVUTIL_VERSION_INT, .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); 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_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)->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; return 0;
} }




+ 1
- 1
libavformat/options.c View File

@@ -55,7 +55,7 @@ static const AVClass *format_child_class_next(const AVClass *prev)
AVOutputFormat *ofmt = NULL; AVOutputFormat *ofmt = NULL;


if (!prev) if (!prev)
return &ffio_url_class;
return &ff_avio_class;


while ((ifmt = av_iformat_next(ifmt))) while ((ifmt = av_iformat_next(ifmt)))
if (ifmt->priv_class == prev) if (ifmt->priv_class == prev)


Loading…
Cancel
Save