summaryrefslogtreecommitdiff
path: root/libavfilter/formats.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-11-05 07:01:39 -0700
committerRonald S. Bultje <rsbultje@gmail.com>2011-11-05 07:01:39 -0700
commit43317fd52cb967b4401e0401998bbf287489a2be (patch)
tree35d4bd3e92e0ff347dda3e1dcd2ae6c5134f80c2 /libavfilter/formats.c
parentd31fb1a9e77f37ee1bbc0faabc655390eb91b579 (diff)
libavfilter: reindent.
Diffstat (limited to 'libavfilter/formats.c')
-rw-r--r--libavfilter/formats.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index f5a3e458af..8c5041a8fe 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -50,13 +50,13 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
/* merge list of formats */
m_count = FFMIN(a->format_count, b->format_count);
if (m_count) {
- ret->formats = av_malloc(sizeof(*ret->formats) * m_count);
- for(i = 0; i < a->format_count; i ++)
- for(j = 0; j < b->format_count; j ++)
- if(a->formats[i] == b->formats[j])
- ret->formats[k++] = a->formats[i];
+ ret->formats = av_malloc(sizeof(*ret->formats) * m_count);
+ for(i = 0; i < a->format_count; i ++)
+ for(j = 0; j < b->format_count; j ++)
+ if(a->formats[i] == b->formats[j])
+ ret->formats[k++] = a->formats[i];
- ret->format_count = k;
+ ret->format_count = k;
}
/* check that there was at least one common format */
if(!ret->format_count) {
@@ -94,7 +94,7 @@ AVFilterFormats *avfilter_make_format_list(const int *fmts)
formats = av_mallocz(sizeof(AVFilterFormats));
if (count)
- formats->formats = av_malloc(sizeof(*formats->formats) * count);
+ formats->formats = av_malloc(sizeof(*formats->formats) * count);
formats->format_count = count;
memcpy(formats->formats, fmts, sizeof(*formats->formats) * count);