Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com> --- libavfilter/formats.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 4ac690ea8a..71060f5f50 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -74,10 +74,10 @@ do { \ * The macro may swap a and b internally, but the combined list is in a. */ #define MERGE_FORMATS(a, b, fmts, nb, type, check, empty_allowed) \ -do { \ +do { \ int i, j, k = 0; \ void *tmp; \ - \ + \ if (empty_allowed) { \ if (!a->nb || !b->nb) { \ if (check) \ @@ -87,14 +87,14 @@ do { goto merge_ref; \ } \ } \ - 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; \ - } \ + 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) \ @@ -104,7 +104,7 @@ do { tmp = av_realloc_array(a->fmts, a->nb, sizeof(*a->fmts)); \ if (tmp) \ a->fmts = tmp; \ - \ + \ merge_ref: \ MERGE_REF(a, b, fmts, type, 1, return AVERROR(ENOMEM);); \ } while (0) -- 2.20.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".