On Tue, Mar 22, 2016 at 11:17:33PM -0400, Vittorio Giovara wrote:
> On Mon, Mar 21, 2016 at 6:56 PM, Diego Biurrun <di...@biurrun.de> wrote:
> > --- a/libavcodec/rangecoder.c
> > +++ b/libavcodec/rangecoder.c
> > @@ -53,9 +53,9 @@ av_cold void ff_init_range_decoder(RangeCoder *c, const
> > uint8_t *buf,
> > int buf_size)
> > {
> > /* cast to avoid compiler warning */
> > - ff_init_range_encoder(c, (uint8_t *)buf, buf_size);
> > + ff_init_range_encoder(c, (uint8_t *) buf, buf_size);
>
>
> > const AVOption *av_opt_next(void *obj, const AVOption *last)
> > {
> > - AVClass *class = *(AVClass**)obj;
> > + AVClass *class = *(AVClass **) obj;
>
>
> > @@ -47,14 +47,25 @@ const AVOption *av_opt_next(void *obj, const AVOption
> > *last)
> > static int read_number(const AVOption *o, void *dst, double *num, int
> > *den, int64_t *intnum)
> > {
> > switch (o->type) {
> > - case AV_OPT_TYPE_FLAGS: *intnum = *(unsigned int*)dst;return 0;
> > - case AV_OPT_TYPE_INT: *intnum = *(int *)dst;return 0;
> > - case AV_OPT_TYPE_INT64: *intnum = *(int64_t *)dst;return 0;
> > - case AV_OPT_TYPE_FLOAT: *num = *(float *)dst;return 0;
> > - case AV_OPT_TYPE_DOUBLE: *num = *(double *)dst;return 0;
> > - case AV_OPT_TYPE_RATIONAL: *intnum = ((AVRational*)dst)->num;
> > - *den = ((AVRational*)dst)->den;
> > - return 0;
> > + case AV_OPT_TYPE_FLAGS:
> > + *intnum = *(unsigned int *) dst;
> > + return 0;
> > + case AV_OPT_TYPE_INT:
> > + *intnum = *(int *) dst;
> > + return 0;
> > + case AV_OPT_TYPE_INT64:
> > + *intnum = *(int64_t *) dst;
> > + return 0;
> > + case AV_OPT_TYPE_FLOAT:
> > + *num = *(float *) dst;
> > + return 0;
> > + case AV_OPT_TYPE_DOUBLE:
> > + *num = *(double *) dst;
> > + return 0;
> > + case AV_OPT_TYPE_RATIONAL:
> > + *intnum = ((AVRational *) dst)->num;
> > + *den = ((AVRational *) dst)->den;
> > + return 0;
>
>
> > case AV_OPT_TYPE_FLAGS:
> > - case AV_OPT_TYPE_INT: *(int *)dst= llrint(num/den)*intnum;
> > break;
> > - case AV_OPT_TYPE_INT64: *(int64_t *)dst= llrint(num/den)*intnum;
> > break;
> > - case AV_OPT_TYPE_FLOAT: *(float *)dst= num*intnum/den;
> > break;
> > - case AV_OPT_TYPE_DOUBLE:*(double *)dst= num*intnum/den;
> > break;
> > + case AV_OPT_TYPE_INT:
> > + *(int *) dst = llrint(num / den) * intnum;
> > + break;
> > + case AV_OPT_TYPE_INT64:
> > + *(int64_t *) dst = llrint(num / den) * intnum;
> > + break;
> > + case AV_OPT_TYPE_FLOAT:
> > + *(float *) dst = num * intnum / den;
> > + break;
> > + case AV_OPT_TYPE_DOUBLE:
> > + *(double *) dst = num * intnum / den;
> > + break;
> > case AV_OPT_TYPE_RATIONAL:
> > - if ((int)num == num) *(AVRational*)dst= (AVRational){num*intnum,
> > den};
> > - else *(AVRational*)dst= av_d2q(num*intnum/den,
> > 1<<24);
> > + if ((int) num == num)
> > + *(AVRational *) dst = (AVRational) { num *intnum, den };
> > + else
> > + *(AVRational *) dst = av_d2q(num * intnum / den, 1 << 24);
> > break;
> > default:
>
> > - int *lendst = (int *)(dst + 1);
> > + int *lendst = (int *) (dst + 1);
> > uint8_t *bin, *ptr;
> > int len = strlen(val);
>
>
> > - dst = ((uint8_t*)target_obj) + o->offset;
> > + dst = ((uint8_t *) target_obj) + o->offset;
>
>
> > - dst = ((uint8_t*)target_obj) + o->offset;
> > + dst = ((uint8_t *) target_obj) + o->offset;
> > return write_number(obj, o, dst, num, den, intnum);
> > }
>
> > - dst = (uint8_t **)(((uint8_t *)target_obj) + o->offset);
> > - lendst = (int *)(dst + 1);
> > + dst = (uint8_t **) (((uint8_t *) target_obj) + o->offset);
> > + lendst = (int *) (dst + 1);
>
> > - dst = (AVDictionary **)(((uint8_t *)target_obj) + o->offset);
> > + dst = (AVDictionary **) (((uint8_t *) target_obj) + o->offset);
> > av_dict_free(dst);
> > av_dict_copy(dst, val, 0);
>
> > - dst = (uint8_t*)target_obj + o->offset;
> > + dst = (uint8_t *) target_obj + o->offset;
>
> > buf[0] = 0;
> > switch (o->type) {
> > - case AV_OPT_TYPE_FLAGS: ret = snprintf(buf, sizeof(buf), "0x%08X",
> > *(int *)dst);break;
> > - case AV_OPT_TYPE_INT: ret = snprintf(buf, sizeof(buf), "%d" ,
> > *(int *)dst);break;
> > - case AV_OPT_TYPE_INT64: ret = snprintf(buf, sizeof(buf),
> > "%"PRId64, *(int64_t*)dst);break;
> > - case AV_OPT_TYPE_FLOAT: ret = snprintf(buf, sizeof(buf), "%f" ,
> > *(float *)dst);break;
> > - case AV_OPT_TYPE_DOUBLE: ret = snprintf(buf, sizeof(buf), "%f" ,
> > *(double *)dst);break;
> > - case AV_OPT_TYPE_RATIONAL: ret = snprintf(buf, sizeof(buf), "%d/%d",
> > ((AVRational*)dst)->num, ((AVRational*)dst)->den);break;
> > + case AV_OPT_TYPE_FLAGS:
> > + ret = snprintf(buf, sizeof(buf), "0x%08X", *(int *) dst);
> > + break;
> > + case AV_OPT_TYPE_INT:
> > + ret = snprintf(buf, sizeof(buf), "%d", *(int *) dst);
> > + break;
> > + case AV_OPT_TYPE_INT64:
> > + ret = snprintf(buf, sizeof(buf), "%" PRId64, *(int64_t *) dst);
> > + break;
> > + case AV_OPT_TYPE_FLOAT:
> > + ret = snprintf(buf, sizeof(buf), "%f", *(float *) dst);
> > + break;
> > + case AV_OPT_TYPE_DOUBLE:
> > + ret = snprintf(buf, sizeof(buf), "%f", *(double *) dst);
> > + break;
> > + case AV_OPT_TYPE_RATIONAL:
> > + ret = snprintf(buf, sizeof(buf), "%d/%d", ((AVRational *)
> > dst)->num, ((AVRational *) dst)->den);
> > + break;
> > case AV_OPT_TYPE_STRING:
> > - if (*(uint8_t**)dst)
> > - *out_val = av_strdup(*(uint8_t**)dst);
> > + if (*(uint8_t **) dst)
> > + *out_val = av_strdup(*(uint8_t **) dst);
>
> > + len = *(int *) (((uint8_t *) dst) + sizeof(uint8_t *));
> > + if ((uint64_t) len * 2 + 1 > INT_MAX)
> > return AVERROR(EINVAL);
> > - if (!(*out_val = av_malloc(len*2 + 1)))
> > + if (!(*out_val = av_malloc(len * 2 + 1)))
> > return AVERROR(ENOMEM);
> > - bin = *(uint8_t**)dst;
> > + bin = *(uint8_t **) dst;
> > for (i = 0; i < len; i++)
>
>
> > - dst = ((uint8_t*)target_obj) + o->offset;
> > + dst = ((uint8_t *) target_obj) + o->offset;
>
> > - src = *(AVDictionary **)(((uint8_t *)target_obj) + o->offset);
> > + src = *(AVDictionary **) (((uint8_t *) target_obj) + o->offset);
> > av_dict_copy(out_val, src, 0);
>
>
> > @@ -536,7 +587,7 @@ int av_opt_show2(void *obj, void *av_log_obj, int
> > req_flags, int rej_flags)
> > if (!obj)
> > return -1;
> >
> > - av_log(av_log_obj, AV_LOG_INFO, "%s AVOptions:\n",
> > (*(AVClass**)obj)->class_name);
> > + av_log(av_log_obj, AV_LOG_INFO, "%s AVOptions:\n", (*(AVClass **)
> > obj)->class_name);
>
> > @@ -663,11 +716,11 @@ void av_opt_free(void *obj)
> > switch (o->type) {
> > case AV_OPT_TYPE_STRING:
> > case AV_OPT_TYPE_BINARY:
> > - av_freep((uint8_t *)obj + o->offset);
> > + av_freep((uint8_t *) obj + o->offset);
> > break;
> >
> > case AV_OPT_TYPE_DICT:
> > - av_dict_free((AVDictionary **)(((uint8_t *)obj) + o->offset));
> > + av_dict_free((AVDictionary **) (((uint8_t *) obj) +
> > o->offset));
> > break;
> >
>
> > {
> > - const AVClass *c = *(AVClass**)obj;
> > + const AVClass *c = *(AVClass **) obj;
> > const AVOption *o = NULL;
>
> > {
> > - const AVClass *c = *(AVClass**)obj;
> > + const AVClass *c = *(AVClass **) obj;
> > if (c->child_next)
> > return c->child_next(obj, prev);
> > return NULL;
>
> Please don't add a space after a parenthesis in the blocks above.
Why no space after cast suddenly?
Diego
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
