[FFmpeg-cvslog] ffprobe: do not escape '"' between single quotes.

Clément Bœsch git at videolan.org
Tue Jan 1 13:34:16 CET 2013


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Tue Jan  1 13:30:42 2013 +0100| [d079d1d368a96e70ae76da7ad483b486fef2a8d2] | committer: Clément Bœsch

ffprobe: do not escape '"' between single quotes.

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

 ffprobe.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index a98344b..f70c24c 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -642,15 +642,15 @@ static const char *csv_escape_str(AVBPrint *dst, const char *src, const char sep
     int needs_quoting = !!src[strcspn(src, meta_chars)];
 
     if (needs_quoting)
-        av_bprint_chars(dst, '\"', 1);
+        av_bprint_chars(dst, '"', 1);
 
     for (; *src; src++) {
         if (*src == '"')
-            av_bprint_chars(dst, '\"', 1);
+            av_bprint_chars(dst, '"', 1);
         av_bprint_chars(dst, *src, 1);
     }
     if (needs_quoting)
-        av_bprint_chars(dst, '\"', 1);
+        av_bprint_chars(dst, '"', 1);
     return dst->str;
 }
 
@@ -1254,7 +1254,7 @@ static const char *xml_escape_str(AVBPrint *dst, const char *src, void *log_ctx)
         case '&' : av_bprintf(dst, "%s", "&");  break;
         case '<' : av_bprintf(dst, "%s", "<");   break;
         case '>' : av_bprintf(dst, "%s", ">");   break;
-        case '\"': av_bprintf(dst, "%s", """); break;
+        case '"' : av_bprintf(dst, "%s", """); break;
         case '\'': av_bprintf(dst, "%s", "'"); break;
         default: av_bprint_chars(dst, *p, 1);
         }



More information about the ffmpeg-cvslog mailing list