[FFmpeg-cvslog] avfilter: dont write out of array for duplicate formats in avfilter_merge_formats()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 23 13:18:11 2011 +0100| [8cda755c2f510fe08b7c78d95392496535582e2f] | committer: 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: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8cda755c2f510fe08b7c78d95392496535582e2f
---

 libavfilter/formats.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index b77ca8a..c626b38 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -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 */