generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/formats: use sizeof(var) instead of sizeof(type).

Browse Source
This commit is contained in:
Anton Khirnov
2012-05-04 09:49:28 +02:00
parent f10530b78a
commit d4ac703c7f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/formats.c
View File

@@ -45,7 +45,7 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
AVFilterFormats *ret; AVFilterFormats *ret;
unsigned i, j, k = 0, m_count; unsigned i, j, k = 0, m_count;
ret = av_mallocz(sizeof(AVFilterFormats)); ret = av_mallocz(sizeof(*ret));
/* merge list of formats */ /* merge list of formats */
m_count = FFMIN(a->format_count, b->format_count); m_count = FFMIN(a->format_count, b->format_count);
@@ -65,7 +65,7 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
return NULL; return NULL;
} }
ret->refs = av_malloc(sizeof(AVFilterFormats**)*(a->refcount+b->refcount)); ret->refs = av_malloc(sizeof(*ret->refs) * (a->refcount + b->refcount));
merge_ref(ret, a); merge_ref(ret, a);
merge_ref(ret, b); merge_ref(ret, b);
@@ -92,7 +92,7 @@ AVFilterFormats *avfilter_make_format_list(const int *fmts)
for (count = 0; fmts[count] != -1; count++) for (count = 0; fmts[count] != -1; count++)
; ;
formats = av_mallocz(sizeof(AVFilterFormats)); formats = av_mallocz(sizeof(*formats));
if (count) if (count)
formats->formats = av_malloc(sizeof(*formats->formats) * count); formats->formats = av_malloc(sizeof(*formats->formats) * count);
formats->format_count = count; formats->format_count = count;
@@ -105,7 +105,7 @@ int avfilter_add_format(AVFilterFormats **avff, int fmt)
{ {
int *fmts; int *fmts;
if (!(*avff) && !(*avff = av_mallocz(sizeof(AVFilterFormats)))) if (!(*avff) && !(*avff = av_mallocz(sizeof(**avff))))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
fmts = av_realloc((*avff)->formats, fmts = av_realloc((*avff)->formats,
@@ -136,7 +136,7 @@ AVFilterFormats *avfilter_all_formats(enum AVMediaType type)
void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref) void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref)
{ {
*ref = f; *ref = f;
f->refs = av_realloc(f->refs, sizeof(AVFilterFormats**) * ++f->refcount); f->refs = av_realloc(f->refs, sizeof(*f->refs) * ++f->refcount);
f->refs[f->refcount-1] = ref; f->refs[f->refcount-1] = ref;
} }
@@ -159,8 +159,8 @@ void avfilter_formats_unref(AVFilterFormats **ref)
idx = find_ref_index(ref); idx = find_ref_index(ref);
if(idx >= 0) if(idx >= 0)
memmove((*ref)->refs + idx, (*ref)->refs + idx+1, memmove((*ref)->refs + idx, (*ref)->refs + idx + 1,
sizeof(AVFilterFormats**) * ((*ref)->refcount-idx-1)); sizeof(*(*ref)->refs) * ((*ref)->refcount - idx - 1));
if(!--(*ref)->refcount) { if(!--(*ref)->refcount) {
av_free((*ref)->formats); av_free((*ref)->formats);