JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mp4v2: rm old HandBrake patch

Browse Source 
Patch no longer used by HandBrake upstream
This commit is contained in:
Anton-Latukha 2018-05-10 11:25:40 +03:00
parent e619a49e2e
commit fd3466d8d8
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch
View File

@ -1,14 +0,0 @@
diff -Naur mp4v2-trunk-r355/src/mp4atom.cpp mp4v2-trunk-r355/src/mp4atom.cpp
--- mp4v2-trunk-r355/src/mp4atom.cpp 2012-02-21 19:40:03.000000000 +0100
+++ mp4v2-trunk-r355/src/mp4atom.cpp 2012-02-21 19:36:38.000000000 +0100
@@ -543,6 +543,10 @@
m_pFile->SetPosition(m_start + 8);
m_pFile->WriteUInt64(m_size);
} else {
+ if (!(m_size <= (uint64_t)0xFFFFFFFF)) {
+ // Let the user know what the following assert is all about
+ fprintf(stderr, "MP4ERROR: File size exceeded 4 GB; output unplayable. Enable \"Large file size\" to fix it.\n");
+ }
ASSERT(m_size <= (uint64_t)0xFFFFFFFF);
m_pFile->SetPosition(m_start);
m_pFile->WriteUInt32(m_size);

4
pkgs/development/libraries/mp4v2/default.nix
View File

@ -9,10 +9,6 @@ stdenv.mkDerivation rec {
};
patches = [
# From Handbrake
# mp4v2 doesn't seem to be actively maintained any more :-/
./A02-meaningful-4gb-warning.patch
(fetchurl {
name = "gcc-7.patch";
url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/"