[FFmpeg-cvslog] libavfilter: reindent.
Ronald S. Bultje
git at videolan.org
Sun Nov 6 02:39:15 CET 2011
ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Nov 5 07:01:39 2011 -0700| [43317fd52cb967b4401e0401998bbf287489a2be] | committer: Ronald S. Bultje
libavfilter: reindent.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43317fd52cb967b4401e0401998bbf287489a2be
---
libavfilter/formats.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index f5a3e45..8c5041a 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);
More information about the ffmpeg-cvslog
mailing list