.gear/rules     |   2 ++
 .gear/tags/list |   1 +
 configure.ac    |   8 ++---
 libmp4v2.spec   | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/rtphint.cpp |   2 +-
 5 files changed, 110 insertions(+), 5 deletions(-)

diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..a84ff3c
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: upstream:.
+diff: upstream:. . name=@name@-@version@-alt.patch
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..4d41752
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+cc17ffe84c08f26011e4a2867f6196e62c4258ee upstream
diff --git a/configure.ac b/configure.ac
index 83e9dce..e573525 100644
--- a/configure.ac
+++ b/configure.ac
@@ -359,10 +359,10 @@ fi
 if test "$enable_debug" = "no"; then
     changequote(<<,>>)dnl
     if test "$GCC" = "yes"; then
-        CFLAGS=`echo "$CFLAGS" | sed -e 's/-g[^ ]*[ ]*//' -e 's/^ //' -e 's/ $//'`
+        CFLAGS=`echo "$CFLAGS" | sed -e 's/\(^\| \)-g[^ ]*[ ]*/ /' -e 's/^ //' -e 's/ $//'`
     fi
     if test "$GXX" = "yes"; then
-        CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/-g[^ ]*[ ]*//' -e 's/^ //' -e 's/ $//'`
+        CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/\(^\| \)-g[^ ]*[ ]*/ /' -e 's/^ //' -e 's/ $//'`
     fi
     changequote([,])dnl
 fi
@@ -374,10 +374,10 @@ fi
 if test "$enable_optimize" = "no"; then
     changequote(<<,>>)dnl
     if test "$GCC" = "yes"; then
-        CFLAGS=`echo "$CFLAGS" | sed -e 's/-O[^ ]*[ ]*//' -e 's/^ //' -e 's/ $//'`
+        CFLAGS=`echo "$CFLAGS" | sed -e 's/\(^\| \)-O[^ ]*[ ]*/ /' -e 's/^ //' -e 's/ $//'`
     fi
     if test "$GXX" = "yes"; then
-        CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/-O[^ ]*[ ]*//' -e 's/^ //' -e 's/ $//'`
+        CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/\(^\| \)-O[^ ]*[ ]*/ /' -e 's/^ //' -e 's/ $//'`
     fi
     changequote([,])dnl
 fi
diff --git a/libmp4v2.spec b/libmp4v2.spec
new file mode 100644
index 0000000..d777d54
--- /dev/null
+++ b/libmp4v2.spec
@@ -0,0 +1,102 @@
+%define _unpackaged_files_terminate_build 1
+
+Summary: This library provides functions to read, create, and modify mp4 files
+Name: libmp4v2-3
+Version: 2.0
+Release: alt5
+License: MPLv1.1
+Group: System/Libraries
+Url: http://code.google.com/p/mp4v2/
+
+Source: %name-%version.tar
+Patch1: %name-%version-alt.patch
+
+BuildRequires: gcc-c++ help2man texinfo
+
+%description
+The MP4v2 library provides an API to create and modify mp4 files
+as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems.
+This file format is derived from Apple's QuickTime file format
+that has been used as a multimedia file format in a variety of platforms and applications.
+It is a very powerful and extensible format that can accommodate practically any type of media.
+
+MP4v2 was originally bundled with mpeg4ip library, but has been moved into its own maintained library
+due to a combination of the cessation of support of mpeg4ip and the usefulness of this library on its own.
+
+%package -n libmp4v2-devel
+Summary: Development files for the mp4v2 library
+Group: Development/Other
+Requires: %name = %EVR
+Conflicts: libmpeg4ip-devel
+
+%description -n libmp4v2-devel
+Development files and documentation needed to develop and compile programs
+using the libmp4v2 library.
+
+%package -n mp4v2-utils
+Group: Sound
+Summary: Command line utils to handle MP4 metadata
+Conflicts: mpeg4ip-tools
+
+%description -n mp4v2-utils
+The libmp4v2 library provides an abstraction layer for working with files
+using the mp4 container format. This library is developed by mpeg4ip project
+and is an exact copy of the library distributed in the mpeg4ip package.
+
+This contains the command line example utilities.
+
+
+%prep
+%setup
+%patch1 -p1
+
+%build
+%autoreconf
+%add_optflags -Wno-narrowing
+%configure --disable-static --disable-debug
+
+mkdir -p doc/articles/txt
+%make_build
+
+%install
+
+%makeinstall_std
+
+%files
+%doc COPYING
+%_libdir/*.so.*
+
+%files -n libmp4v2-devel
+%doc README
+%_includedir/*
+%_libdir/*.so
+
+%files -n mp4v2-utils
+%_bindir/*
+%_man1dir/*
+
+%changelog
+* Thu Apr 15 2021 Grigory Ustinov <grenka@altlinux.org> 2.0-alt5
+- Fixed FTBFS with -Wno-narrowing.
+
+* Mon Sep 17 2018 Aleksei Nikiforov <darktemplar@altlinux.org> 2.0-alt4
+- Fixed build.
+
+* Tue Jan 09 2018 Aleksei Nikiforov <darktemplar@altlinux.org> 2.0-alt3
+- Fixed build.
+
+* Fri Jan  1 2016 Terechkov Evgenii <evg@altlinux.org> 2.0-alt2
+- Fix FTBFS
+
+* Sat Sep  5 2015 Terechkov Evgenii <evg@altlinux.org> 2.0-alt1
+- 2.0 (upstream git commit cc17ffe)
+- Packet renamed to libmp4v2-3
+
+* Sat Sep  5 2015 Terechkov Evgenii <evg@altlinux.org> 1.9.1-alt2
+- Rebuilt as compat package without subpackages (devel,utils)
+
+* Thu Dec 06 2012 Eugeny A. Rostovtsev (REAL) <real at altlinux.org> 1.9.1-alt1.1
+- Fixed build
+
+* Mon Jan 17 2011 Alexey Shabalin <shaba@altlinux.ru> 1.9.1-alt1
+- initial build for ALT Linux Sisyphus
diff --git a/src/rtphint.cpp b/src/rtphint.cpp
index e07309d..1eb01f5 100644
--- a/src/rtphint.cpp
+++ b/src/rtphint.cpp
@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload(
                 pSlash = strchr(pSlash, '/');
                 if (pSlash != NULL) {
                     pSlash++;
-                    if (pSlash != '\0') {
+                    if (*pSlash != '\0') {
                         length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
                         strncpy(*ppEncodingParams, pSlash, length);