[FFmpeg-cvslog] ffprobe: do not lose non ascii characters in non utf8 strings

Michael Niedermayer git at videolan.org
Wed Apr 16 19:20:38 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 12 20:13:13 2014 +0200| [fe87a40de6792ee97686ce4a215268041e3fcf81] | committer: Carl Eugen Hoyos

ffprobe: do not lose non ascii characters in non utf8 strings

Fixes Ticket3363

Using U+FFFD REPLACEMENT CHARACTER as suggested by nicolas

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ca6dd53a734d6fc453de425340d7e9ec4ef385b5)

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

 ffprobe.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffprobe.c b/ffprobe.c
index ef3bcc6..9e39ff7 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -336,7 +336,7 @@ static const AVOption writer_options[] = {
     { "replace", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = WRITER_STRING_VALIDATION_REPLACE}, .unit = "sv" },
     { "fail",    NULL, 0, AV_OPT_TYPE_CONST, {.i64 = WRITER_STRING_VALIDATION_FAIL},    .unit = "sv" },
     { "string_validation_replacement", "set string validation replacement string", OFFSET(string_validation_replacement), AV_OPT_TYPE_STRING, {.str=""}},
-    { "svr", "set string validation replacement string", OFFSET(string_validation_replacement), AV_OPT_TYPE_STRING, {.str=""}},
+    { "svr", "set string validation replacement string", OFFSET(string_validation_replacement), AV_OPT_TYPE_STRING, {.str="\xEF\xBF\xBD"}},
     { NULL }
 };
 



More information about the ffmpeg-cvslog mailing list