aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-18 13:31:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-18 13:36:49 +0200
commitd56ced5fbf3c76ebd5c5b015695101c634e53e4a (patch)
tree3916bdbb37f0de94ca4a63a740436a115796b97a
parentfb8dde37e4b0d7966194bc614a1040eee902c4e1 (diff)
parentbf5b5d2b1561535cc013c12ab8033228bb0d0081 (diff)
downloadffmpeg-d56ced5fbf3c76ebd5c5b015695101c634e53e4a.tar.gz
Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'
* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081': avfilter.c: cosmetics, reformat Conflicts: libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/avfilter.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 5d5243d33d..c96c09c10d 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -66,7 +66,8 @@ void ff_tlog_ref(void *ctx, AVFrame *ref, int end)
ff_tlog(ctx, "]%s", end ? "\n" : "");
}
-unsigned avfilter_version(void) {
+unsigned avfilter_version(void)
+{
av_assert0(LIBAVFILTER_VERSION_MICRO >= 100);
return LIBAVFILTER_VERSION_INT;
}
@@ -101,13 +102,13 @@ void ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off,
*pads = av_realloc(*pads, sizeof(AVFilterPad) * (*count + 1));
*links = av_realloc(*links, sizeof(AVFilterLink*) * (*count + 1));
- memmove(*pads +idx+1, *pads +idx, sizeof(AVFilterPad) * (*count-idx));
- memmove(*links+idx+1, *links+idx, sizeof(AVFilterLink*) * (*count-idx));
- memcpy(*pads+idx, newpad, sizeof(AVFilterPad));
+ memmove(*pads + idx + 1, *pads + idx, sizeof(AVFilterPad) * (*count - idx));
+ memmove(*links + idx + 1, *links + idx, sizeof(AVFilterLink*) * (*count - idx));
+ memcpy(*pads + idx, newpad, sizeof(AVFilterPad));
(*links)[idx] = NULL;
(*count)++;
- for (i = idx+1; i < *count; i++)
+ for (i = idx + 1; i < *count; i++)
if (*links[i])
(*(unsigned *)((uint8_t *) *links[i] + padidx_off))++;
}
@@ -181,19 +182,18 @@ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
}
/* re-hookup the link to the new destination filter we inserted */
- link->dst = filt;
- link->dstpad = &filt->input_pads[filt_srcpad_idx];
+ link->dst = filt;
+ link->dstpad = &filt->input_pads[filt_srcpad_idx];
filt->inputs[filt_srcpad_idx] = link;
/* if any information on supported media formats already exists on the
* link, we need to preserve that */
if (link->out_formats)
ff_formats_changeref(&link->out_formats,
- &filt->outputs[filt_dstpad_idx]->out_formats);
-
+ &filt->outputs[filt_dstpad_idx]->out_formats);
if (link->out_samplerates)
ff_formats_changeref(&link->out_samplerates,
- &filt->outputs[filt_dstpad_idx]->out_samplerates);
+ &filt->outputs[filt_dstpad_idx]->out_samplerates);
if (link->out_channel_layouts)
ff_channel_layouts_changeref(&link->out_channel_layouts,
&filt->outputs[filt_dstpad_idx]->out_channel_layouts);
@@ -493,7 +493,8 @@ int avfilter_pad_count(const AVFilterPad *pads)
if (!pads)
return 0;
- for(count = 0; pads->name; count ++) pads ++;
+ for (count = 0; pads->name; count++)
+ pads++;
return count;
}
@@ -790,7 +791,7 @@ int avfilter_init_str(AVFilterContext *filter, const char *args)
{
AVDictionary *options = NULL;
AVDictionaryEntry *e;
- int ret=0;
+ int ret = 0;
if (args && *args) {
if (!filter->filter->priv_class) {