diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:02:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:02:42 +0100 |
| commit | 1fb3642317768c02db0eaf8d0d118d37a970f091 (patch) | |
| tree | 821e7babb15f70691bbab2b5207b158e56eaa6c5 | |
| parent | e8565d21c276ab9ac5ce785549420321fbd0b093 (diff) | |
| parent | c86d8aed748adc3ba8df96fb1fe14aa45da77a31 (diff) | |
| download | ffmpeg-1fb3642317768c02db0eaf8d0d118d37a970f091.tar.gz | |
Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'
* commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31':
avio: Rename avclass symbols relating to avio
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 f728535495..1ed5831e78 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 377d96686d..8fd04668c0 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -42,28 +42,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); @@ -775,7 +775,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 22b922f89a..4b08f3f199 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) |