[SCM] faac/master: remove patches, applied upstream
fabian at users.alioth.debian.org
fabian at users.alioth.debian.org
Mon Nov 30 07:14:07 UTC 2015
The following commit has been merged in the master branch:
commit 68b2d64467d112c369c72e554f1907932289376a
Author: Fabian Greffrath <fabian at debian.org>
Date: Mon Nov 30 08:03:09 2015 +0100
remove patches, applied upstream
diff --git a/debian/patches/frontend-without-libmp4v2.diff b/debian/patches/frontend-without-libmp4v2.diff
deleted file mode 100644
index c1683fd..0000000
--- a/debian/patches/frontend-without-libmp4v2.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix compilation without libmp4v2
-Bug: https://sourceforge.net/p/faac/bugs/200/
-Author: Krzysztof Nikiel
-
---- a/frontend/main.c
-+++ b/frontend/main.c
-@@ -409,7 +409,6 @@ int main(int argc, char *argv[])
- unsigned int useMidSide = 1;
- static unsigned int useTns = DEFAULT_TNS;
- enum container_format container = NO_CONTAINER;
-- int optimizeFlag = 0;
- enum stream_format stream = ADTS_STREAM;
- int cutOff = -1;
- int bitRate = 0;
-@@ -439,6 +438,7 @@ int main(int argc, char *argv[])
- FILE *outfile = NULL;
-
- #ifdef HAVE_LIBMP4V2
-+ int optimizeFlag = 0;
- MP4FileHandle MP4hFile = MP4_INVALID_FILE_HANDLE;
- MP4TrackId MP4track = 0;
- unsigned int ntracks = 0, trackno = 0;
-@@ -448,11 +448,11 @@ int main(int argc, char *argv[])
- *genre = NULL, *comment = NULL, *writer = NULL;
- u_int8_t *art = NULL;
- u_int64_t artSize = 0;
-- u_int64_t total_samples = 0;
- u_int64_t encoded_samples = 0;
- unsigned int delay_samples;
- unsigned int frameSize;
- #endif
-+ u_int64_t total_samples = 0;
- char *faac_id_string;
- char *faac_copyright_string;
-
-@@ -1078,12 +1078,10 @@ int main(int argc, char *argv[])
- else
- samplesRead = 0;
-
--#ifdef HAVE_LIBMP4V2
- if (total_samples + (samplesRead / infile->channels) > infile->samples)
- samplesRead = (infile->samples - total_samples) * infile->channels;
-
- total_samples += samplesRead / infile->channels;
--#endif
-
- /* call the actual encoding routine */
- bytesWritten = faacEncEncode(hEncoder,
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4d484c8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-frontend-without-libmp4v2.diff
--
faac packaging
More information about the pkg-multimedia-commits
mailing list