videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-18 23:35:06 +02:00
Code Releases Activity

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

Browse Source 
Note, this is a theoretical fix, iam not aware of a case where this function receives
duplicates in its input.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-23 13:18:11 +01:00
parent 0b9a69f244
commit 8cda755c2f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/formats.c
View File

@ -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 */