[FFmpeg-cvslog] avutil/parsing: add '\r' as whitespace

Muhammad Faiz git at videolan.org
Fri May 6 02:47:25 CEST 2016


ffmpeg | branch: master | Muhammad Faiz <mfcc64 at gmail.com> | Fri May  6 07:35:45 2016 +0700| [83065939cb84d79f1880bf3470e031619b55988b] | committer: Muhammad Faiz

avutil/parsing: add '\r' as whitespace

for compatibility with platforms that treat it
as newline

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

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

 libavutil/avstring.c |    2 +-
 libavutil/bprint.c   |    2 +-
 libavutil/opt.c      |    2 +-
 libavutil/version.h  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 85fb3e9..b4dace0 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 0a0d078..7ef84d4 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 ae92da0..70a68d9 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 57759da..35b6374 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, \



More information about the ffmpeg-cvslog mailing list