virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00
Code Issues Releases Activity

libavfilter: reindent.

Browse Source
This commit is contained in:
Ronald S. Bultje 2011-11-05 07:01:39 -07:00
parent d31fb1a9e7
commit 43317fd52c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/formats.c
View File

@ -50,13 +50,13 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
/* 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);
if (m_count) { if (m_count) {
ret->formats = av_malloc(sizeof(*ret->formats) * m_count); ret->formats = av_malloc(sizeof(*ret->formats) * m_count);
for(i = 0; i < a->format_count; i ++) for(i = 0; i < a->format_count; i ++)
for(j = 0; j < b->format_count; j ++) for(j = 0; j < b->format_count; j ++)
if(a->formats[i] == b->formats[j]) if(a->formats[i] == b->formats[j])
ret->formats[k++] = a->formats[i]; ret->formats[k++] = a->formats[i];
ret->format_count = k; ret->format_count = k;
} }
/* check that there was at least one common format */ /* check that there was at least one common format */
if(!ret->format_count) { if(!ret->format_count) {
@ -94,7 +94,7 @@ AVFilterFormats *avfilter_make_format_list(const int *fmts)
formats = av_mallocz(sizeof(AVFilterFormats)); formats = av_mallocz(sizeof(AVFilterFormats));
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;
memcpy(formats->formats, fmts, sizeof(*formats->formats) * count); memcpy(formats->formats, fmts, sizeof(*formats->formats) * count);