ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'

Browse Source 
* commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31':
  avio: Rename avclass symbols relating to avio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-28 23:02:36 +01:00
commit 1fb3642317
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avio_internal.h
View File

@ -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,

16
libavformat/aviobuf.c
View File

@ -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;
}

2
libavformat/options.c
View File

@ -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)