From: Muhammad Faiz <mfcc64@gmail.com>
Date: Fri, 6 May 2016 00:35:45 +0000 (+0700)
Subject: avutil/parsing: add '\r' as whitespace
X-Git-Tag: android-x86-7.1-r1~5359
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=83065939cb84d79f1880bf3470e031619b55988b;p=android-x86%2Fexternal-ffmpeg.git

avutil/parsing: add '\r' as whitespace

for compatibility with platforms that treat it
as newline

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
---

diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 85fb3e921e..b4dace08cc 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -144,7 +144,7 @@ char *av_d2str(double d)
     return str;
 }
 
-#define WHITESPACES " \n\t"
+#define WHITESPACES " \n\t\r"
 
 char *av_get_token(const char **buf, const char *term)
 {
diff --git a/libavutil/bprint.c b/libavutil/bprint.c
index 0a0d07861b..7ef84d4d26 100644
--- a/libavutil/bprint.c
+++ b/libavutil/bprint.c
@@ -260,7 +260,7 @@ int av_bprint_finalize(AVBPrint *buf, char **ret_str)
     return ret;
 }
 
-#define WHITESPACES " \n\t"
+#define WHITESPACES " \n\t\r"
 
 void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_chars,
                       enum AVEscapeMode mode, int flags)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index ae92da06c4..70a68d92e3 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1395,7 +1395,7 @@ int av_set_options_string(void *ctx, const char *opts,
     return count;
 }
 
-#define WHITESPACES " \n\t"
+#define WHITESPACES " \n\t\r"
 
 static int is_key_char(char c)
 {
diff --git a/libavutil/version.h b/libavutil/version.h
index 57759dadbb..35b6374f36 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -64,7 +64,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  55
-#define LIBAVUTIL_VERSION_MINOR  23
+#define LIBAVUTIL_VERSION_MINOR  24
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \