Commit 8cda755c authored by Michael Niedermayer's avatar Michael Niedermayer

avfilter: dont write out of array for duplicate formats in avfilter_merge_formats()

Note, this is a theoretical fix, iam not aware of a case where this function receives
duplicates in its input.
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 0b9a69f2
......@@ -56,8 +56,10 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
b->format_count));
for (i = 0; i < a->format_count; i++)
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];
break;
}
ret->format_count = k;
/* check that there was at least one common format */
......
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