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 85fb3e921e4fbb2a54550818018d68b256f5606b..b4dace08ccae839eea5be4117da0cfe76a08cd32 100644 (file)
--- 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 0a0d07861b434598b1295e73a205cfd1baf34710..7ef84d4d269546e66f274572057984f73431009b 100644 (file)
--- 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 ae92da06c4e0e470ac96c9d4c7ce8d96a41af572..70a68d92e3ded7d8a4bbb90395cf03e1ccc415b1 100644 (file)
--- 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 57759dadbb8e699cf6ac101e40b62d0b8145bf4f..35b6374f36fefa31f97a7ab97445f7ce9e1c7231 100644 (file)
--- 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, \