From b1703a8c733cb24844a1c0c133cc599fdf4e7dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Martinez?= Date: Wed, 10 Oct 2018 17:20:26 +0200 Subject: [PATCH] x MPEG-4: use ISO 8859-1 locale when showing atom codes --- Source/MediaInfo/File__Analyze_Buffer.cpp | 2 +- Source/MediaInfo/Multiple/File_Mpeg4.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/MediaInfo/File__Analyze_Buffer.cpp b/Source/MediaInfo/File__Analyze_Buffer.cpp index 3e1776f69..f50ab86ed 100644 --- a/Source/MediaInfo/File__Analyze_Buffer.cpp +++ b/Source/MediaInfo/File__Analyze_Buffer.cpp @@ -1570,7 +1570,7 @@ void File__Analyze::Get_C4(int32u &Info, const char* Name) { INTEGRITY_SIZE_ATLEAST_INT(4); Info=CC4(Buffer+Buffer_Offset+(size_t)Element_Offset); - if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 4, false); + if (Trace_Activated) Param(Name, Ztring().From_ISO_8859_1((const char*)Buffer+Buffer_Offset+(size_t)Element_Offset, 4), false); Element_Offset+=4; } diff --git a/Source/MediaInfo/Multiple/File_Mpeg4.cpp b/Source/MediaInfo/Multiple/File_Mpeg4.cpp index 0ef46177b..72d2cddd2 100644 --- a/Source/MediaInfo/Multiple/File_Mpeg4.cpp +++ b/Source/MediaInfo/Multiple/File_Mpeg4.cpp @@ -1900,7 +1900,7 @@ void File_Mpeg4::Header_Parse() } //Filling - Header_Fill_Code(Name, Ztring().From_CC4(Name)); + Header_Fill_Code(Name, Ztring().From_ISO_8859_1((const char*)Buffer+Buffer_Offset+4, 4)); Header_Fill_Size(Size); if (Name==0x6D6F6F76 && Buffer_Offset+Size>Buffer_Size-Buffer_Offset) //moov