mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-19 07:45:05 +02:00
avfilter: Error out from avfilter_merge_formats() when there are duplicates
instead of trying to continue. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
4d874fc2b1
commit
248bb81ebc
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user