summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Faiz <mfcc64@gmail.com>2016-05-06 07:35:45 +0700
committerMuhammad Faiz <mfcc64@gmail.com>2016-05-06 07:35:45 +0700
commit83065939cb84d79f1880bf3470e031619b55988b (patch)
treeb5708daaa8867699707e9a2c8a41c46d6c812002
parent9c1aa14bf0b88da9f91dc114519e725cbd69180e (diff)
avutil/parsing: add '\r' as whitespace
for compatibility with platforms that treat it as newline Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
-rw-r--r--libavutil/avstring.c2
-rw-r--r--libavutil/bprint.c2
-rw-r--r--libavutil/opt.c2
-rw-r--r--libavutil/version.h2
4 files changed, 4 insertions, 4 deletions
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, \