From 16f4d2165cd0ebccdb567cadb45fb4d44f6ae678 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 1 Oct 2020 19:09:01 +0200
Subject: [PATCH] Do not incorrectly abbreviate MPEG-4 ASP as H.263

Unlike MPEG-4 AVC and H.264, MPEG-4 ASP and H.263 are not identical.
---
 CMakeLists.txt  | 2 +-
 mediaformat.cpp | 4 ++--
 mp4/mp4ids.h    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 928334c..f4a7480 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
 set(META_APP_DESCRIPTION "C++ library for reading and writing MP4 (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags")
 set(META_VERSION_MAJOR 9)
 set(META_VERSION_MINOR 2)
-set(META_VERSION_PATCH 0)
+set(META_VERSION_PATCH 1)
 set(META_REQUIRED_CPP_UNIT_VERSION 1.14.0)
 set(META_ADD_DEFAULT_CPP_UNIT_TEST_APPLICATION ON)
 
diff --git a/mediaformat.cpp b/mediaformat.cpp
index a3d3184..c9de364 100644
--- a/mediaformat.cpp
+++ b/mediaformat.cpp
@@ -622,7 +622,7 @@ const char *MediaFormat::abbreviation() const
         case Mpeg4AdvancedSimpleProfile4:
         case Mpeg4AdvancedSimpleProfile5:
         case Mpeg4AdvancedSimpleProfile3b:
-            return "H.263";
+            return "MPEG-4 ASP";
         case Mpeg4AvcProfile:
             return "H.264";
         default:
@@ -882,7 +882,7 @@ const char *MediaFormat::shortAbbreviation() const
         case Mpeg4AdvancedSimpleProfile4:
         case Mpeg4AdvancedSimpleProfile5:
         case Mpeg4AdvancedSimpleProfile3b:
-            return "H.263";
+            return "MPEG-4-ASP";
         case Mpeg4AvcProfile:
             return "H.264";
         default:
diff --git a/mp4/mp4ids.h b/mp4/mp4ids.h
index 3b7f47d..77c4a2f 100644
--- a/mp4/mp4ids.h
+++ b/mp4/mp4ids.h
@@ -184,7 +184,7 @@ enum KnownValue : std::uint32_t {
     AppleGif = 0x67696620, /**< gif  */
     AppleGraphics = 0x736D630, /**< ?6Ö0 */
     AppleGsm101 = 0x6167736D, /**< agsm */
-    AppleH261 = 0x68323631, /**< h261 */
+    AppleH261 = 0x68323631, /**< H.261 */
     AppleIntermediateCodec = 0x69636F64, /**< icod */
     AppleLossless = 0x616C6163, /**< alac */
     AppleMacpaint = 0x504E5447, /**< PNTG */
@@ -279,7 +279,7 @@ enum KnownValue : std::uint32_t {
     Glass = 0x676C6173, /**< glas */
     GradientWipe = 0x6D617474, /**< matt */
     Graphics = 0x736D6320, /**< smc : Graphics */
-    H263Quicktime = 0x68323633, /**< h263: H.263/MPEG-4 ASP video (Quicktime) */
+    H263Quicktime = 0x68323633, /**< h263: H.263 (Quicktime) */
     H2633GPP = 0x73323633, /**< s263: H.263 (3GPP format) */
     H264Decoder1 = 0x44415643, /**< DAVC */
     H264Decoder2 = 0x48323634, /**< H264 */