From 0b1509107dc1720f7da6149a8791085794b5677f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 14 Nov 2017 14:07:51 +0100 Subject: [PATCH] mp4v2: add upstream patch fixing build issue with gcc 7+ Fixes: http://autobuild.buildroot.net/results/fc0/fc0f51f3ee1364f55248e8fe713995bc07f877c6/ http://autobuild.buildroot.net/results/b0e/b0e68ad2aeb7c191cdaa9856a36bd2cae4bcd5f0/ http://autobuild.buildroot.net/results/a66/a66c89e3fb3f1d9802581aaffad87a547c6e67f5/ And many more. Add an upstream patch fixing invalid code that now triggers a build error on gcc7+. Signed-off-by: Peter Korsgaard --- package/mp4v2/0001-Fix-GCC7-build.patch | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/mp4v2/0001-Fix-GCC7-build.patch diff --git a/package/mp4v2/0001-Fix-GCC7-build.patch b/package/mp4v2/0001-Fix-GCC7-build.patch new file mode 100644 index 0000000000..90222c10ae --- /dev/null +++ b/package/mp4v2/0001-Fix-GCC7-build.patch @@ -0,0 +1,32 @@ +From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= +Date: Wed, 8 Feb 2017 00:56:32 +0000 +Subject: [PATCH] Fix GCC7 build + +if (*pSlash != '\0') { + +As it stands the body of that if will always execute and when there are +no encoding parameters ppEncodingParams will be returned as a pointer to +an empty string rather than as a null pointer + +Signed-off-by: Peter Korsgaard +--- + src/rtphint.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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); +-- +2.11.0 + -- 2.39.2