On Sun, 27 Oct 2013 14:45:29 +0100, Luca Barbato <[email protected]> wrote: > --- > libavformat/avio.c | 88 > ++++++++++++++++++++++++++++++------------------------ > 1 file changed, 49 insertions(+), 39 deletions(-) > > diff --git a/libavformat/avio.c b/libavformat/avio.c > index 689d4a1..8f079bf 100644 > --- a/libavformat/avio.c > +++ b/libavformat/avio.c > @@ -42,8 +42,10 @@ URLProtocol *ffurl_protocol_next(URLProtocol *prev) > static const char *urlcontext_to_name(void *ptr) > { > URLContext *h = (URLContext *)ptr; > - if(h->prot) return h->prot->name; > - else return "NULL"; > + if (h->prot) > + return h->prot->name; > + else > + return "NULL"; > } > > static void *urlcontext_child_next(void *obj, void *prev) > @@ -68,26 +70,25 @@ static const AVClass *urlcontext_child_class_next(const > AVClass *prev) > if (p->priv_data_class) > return p->priv_data_class; > return NULL; > - > } > > -static const AVOption options[] = {{NULL}}; > +static const AVOption options[] = { { NULL } }; > const AVClass ffurl_context_class = { > - .class_name = "URLContext", > - .item_name = urlcontext_to_name, > - .option = options, > - .version = LIBAVUTIL_VERSION_INT, > - .child_next = urlcontext_child_next, > + .class_name = "URLContext", > + .item_name = urlcontext_to_name, > + .option = options, > + .version = LIBAVUTIL_VERSION_INT, > + .child_next = urlcontext_child_next, > .child_class_next = urlcontext_child_class_next, > }; > /*@}*/ > > - > const char *avio_enum_protocols(void **opaque, int output) > { > URLProtocol *p; > *opaque = ffurl_protocol_next(*opaque); > - if (!(p = *opaque)) return NULL; > + if (!(p = *opaque)) > + return NULL; > if ((output && p->url_write) || (!output && p->url_read)) > return p->name; > return avio_enum_protocols(opaque, output); > @@ -97,20 +98,21 @@ int ffurl_register_protocol(URLProtocol *protocol, int > size) > { > URLProtocol **p; > if (size < sizeof(URLProtocol)) { > - URLProtocol* temp = av_mallocz(sizeof(URLProtocol)); > + URLProtocol *temp = av_mallocz(sizeof(URLProtocol)); > memcpy(temp, protocol, size); > protocol = temp; > } > p = &first_protocol; > - while (*p != NULL) p = &(*p)->next; > - *p = protocol; > + while (*p != NULL) > + p = &(*p)->next; > + *p = protocol; > protocol->next = NULL; > return 0; > } > > -static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up, > - const char *filename, int flags, > - const AVIOInterruptCB *int_cb) > +static int url_alloc_for_protocol(URLContext **puc, struct URLProtocol *up, > + const char *filename, int flags, > + const AVIOInterruptCB *int_cb) > { > URLContext *uc; > int err; > @@ -125,16 +127,16 @@ static int url_alloc_for_protocol (URLContext **puc, > struct URLProtocol *up, > goto fail; > } > uc->av_class = &ffurl_context_class; > - uc->filename = (char *) &uc[1]; > + uc->filename = (char *)&uc[1]; > strcpy(uc->filename, filename); > - uc->prot = up; > - uc->flags = flags; > - uc->is_streamed = 0; /* default = not streamed */ > + uc->prot = up; > + uc->flags = flags; > + uc->is_streamed = 0; /* default = not streamed */ > uc->max_packet_size = 0; /* default: stream file */ > if (up->priv_data_size) { > uc->priv_data = av_mallocz(up->priv_data_size); > if (up->priv_data_class) { > - *(const AVClass**)uc->priv_data = up->priv_data_class; > + *(const AVClass **)uc->priv_data = up->priv_data_class; > av_opt_set_defaults(uc->priv_data); > } > } > @@ -143,7 +145,7 @@ static int url_alloc_for_protocol (URLContext **puc, > struct URLProtocol *up, > > *puc = uc; > return 0; > - fail: > +fail: > *puc = NULL; > #if CONFIG_NETWORK > if (up->flags & URL_PROTOCOL_FLAG_NETWORK) > @@ -152,19 +154,22 @@ static int url_alloc_for_protocol (URLContext **puc, > struct URLProtocol *up, > return err; > } > > -int ffurl_connect(URLContext* uc, AVDictionary **options) > +int ffurl_connect(URLContext *uc, AVDictionary **options) > { > int err = > - uc->prot->url_open2 ? uc->prot->url_open2(uc, uc->filename, > uc->flags, options) : > + uc->prot->url_open2 ? uc->prot->url_open2(uc, > + uc->filename, > + uc->flags, > + options) : > uc->prot->url_open(uc, uc->filename, uc->flags); > if (err) > return err; > uc->is_connected = 1; > //We must be careful here as ffurl_seek() could be slow, for example for > http > - if( (uc->flags & AVIO_FLAG_WRITE) > - || !strcmp(uc->prot->name, "file")) > - if(!uc->is_streamed && ffurl_seek(uc, 0, SEEK_SET) < 0) > - uc->is_streamed= 1; > + if ((uc->flags & AVIO_FLAG_WRITE) > + || !strcmp(uc->prot->name, "file"))
|| should go on the previous line Otherwise looks okish -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
