Commit 248bb81e authored by Michael Niedermayer's avatar Michael Niedermayer

avfilter: Error out from avfilter_merge_formats() when there are duplicates

instead of trying to continue.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4d874fc2
......@@ -57,8 +57,13 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
for (i = 0; i < a->format_count; i++)
for (j = 0; j < b->format_count; j++)
if (a->formats[i] == b->formats[j]){
if(k >= FFMIN(a->format_count, b->format_count)){
av_log(0, AV_LOG_ERROR, "Duplicate formats in avfilter_merge_formats() detected\n");
av_free(ret->formats);
av_free(ret);
return NULL;
}
ret->formats[k++] = a->formats[i];
break;
}
ret->format_count = k;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment