From dde8068856c19df4c6f5c75522cff2abeb9362b1 Mon Sep 17 00:00:00 2001
From: Alexander Strasser <eclipse7@gmx.net>
Date: Mon, 17 Sep 2012 01:51:53 +0200
Subject: [PATCH] ffprobe: Consider the chosen separator when doing CSV
 escaping

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
---
 ffprobe.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ffprobe.c b/ffprobe.c
index ad94995169..367b3cab8c 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -567,7 +567,8 @@ static const char *c_escape_str(AVBPrint *dst, const char *src, const char sep,
  */
 static const char *csv_escape_str(AVBPrint *dst, const char *src, const char sep, void *log_ctx)
 {
-    int needs_quoting = !!src[strcspn(src, "\",\n\r")];
+    char meta_chars[] = { sep, '"', '\n', '\r', '\0' };
+    int needs_quoting = !!src[strcspn(src, meta_chars)];
 
     if (needs_quoting)
         av_bprint_chars(dst, '\"', 1);