|
@@ -72,7 +72,7 @@ do { |
|
|
for (j = 0; j < b->nb; j++) \ |
|
|
for (j = 0; j < b->nb; j++) \ |
|
|
if (a->fmts[i] == b->fmts[j]) { \ |
|
|
if (a->fmts[i] == b->fmts[j]) { \ |
|
|
if(k >= FFMIN(a->nb, b->nb)){ \ |
|
|
if(k >= FFMIN(a->nb, b->nb)){ \ |
|
|
av_log(NULL, AV_LOG_ERROR, "Duplicate formats in avfilter_merge_formats() detected\n"); \ |
|
|
|
|
|
|
|
|
av_log(NULL, AV_LOG_ERROR, "Duplicate formats in %s detected\n", __FUNCTION__); \ |
|
|
av_free(ret->fmts); \ |
|
|
av_free(ret->fmts); \ |
|
|
av_free(ret); \ |
|
|
av_free(ret); \ |
|
|
return NULL; \ |
|
|
return NULL; \ |
|
|