RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-09 16:50:01 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
instead of trying to continue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-23 14:14:01 +01:00
parent 4d874fc2b1
commit 248bb81ebc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/formats.c
View File

@ -57,8 +57,13 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
for (i = 0; i < a->format_count; i++) for (i = 0; i < a->format_count; i++)
for (j = 0; j < b->format_count; j++) for (j = 0; j < b->format_count; j++)
if (a->formats[i] == b->formats[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]; ret->formats[k++] = a->formats[i];
break;
} }
ret->format_count = k; ret->format_count = k;