ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@gmail.com> | Fri Aug 14 19:21:18 2020 +0200| [b2266961c04eb4cfc3c842e092d3f7198a586719] | committer: Andreas Rheinhardt
avfilter/formats: Cosmetics Reviewed-by: Paul B Mahol <one...@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2266961c04eb4cfc3c842e092d3f7198a586719 --- libavfilter/formats.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 78f698745c..8918118b8e 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -62,9 +62,9 @@ do { \ * merged; otherwise, it is treated as error. */ #define MERGE_FORMATS(a, b, fmts, nb, type, check, empty_allowed) \ -do { \ +do { \ int i, j, k = 0, skip = 0; \ - \ + \ if (empty_allowed) { \ if (!a->nb || !b->nb) { \ if (check) \ @@ -75,20 +75,20 @@ do { } \ } \ if (!skip) { \ - for (i = 0; i < a->nb; i++) \ - for (j = 0; j < b->nb; j++) \ - if (a->fmts[i] == b->fmts[j]) { \ + for (i = 0; i < a->nb; i++) \ + for (j = 0; j < b->nb; j++) \ + if (a->fmts[i] == b->fmts[j]) { \ if (check) \ return 1; \ a->fmts[k++] = a->fmts[i]; \ - break; \ - } \ - /* Check that there was at least one common format. \ - * Notice that both a and b are unchanged if not. */ \ - if (!k) \ - return 0; \ - av_assert2(!check); \ - a->nb = k; \ + break; \ + } \ + /* Check that there was at least one common format. \ + * Notice that both a and b are unchanged if not. */ \ + if (!k) \ + return 0; \ + av_assert2(!check); \ + a->nb = k; \ } \ \ MERGE_REF(a, b, fmts, type, return AVERROR(ENOMEM);); \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
