[SCM] bs1770gain/master: Dropped 10-unsigned-char-archs.diff and refreshed 20-audio-decode-problem.diff now included upstream.

[pere at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c80c8da367a095218709c89bcef9fed6425665ac
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Jun 23 20:49:56 2015 +0000

    Dropped 10-unsigned-char-archs.diff and refreshed 20-audio-decode-problem.diff now included upstream.

diff --git a/debian/patches/10-unsigned-char-archs.diff b/debian/patches/10-unsigned-char-archs.diff
deleted file mode 100644
index 033cdd0..0000000
--- a/debian/patches/10-unsigned-char-archs.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix build problem on archs with signed char
- The return type of getc() is int to be able to return both characters
- and EOF (-1).  The test in the code is always false when the return is
- stored in a char when char is unsigned.  This fixes build problem on
- arm* and many other architectures.
-Author: Petter Reinholdtsen <pere at debian.org>
-Bug-Debian: https://bugs.debian.org/789248
-Forwarded: no
-Reviewed-By: Petter Reinholdtsen <pere at debian.org>
-Last-Update: 2015-06-20
-
---- bs1770gain-0.4.3.orig/libffsox-2/ffsox_csv2avdict.c
-+++ bs1770gain-0.4.3/libffsox-2/ffsox_csv2avdict.c
-@@ -255,11 +255,14 @@ static int priv_get_utf8(priv_t *b)
-   static unsigned short mask[] = {192, 224, 240}; 
- 
-   char *wp=b->ch;
-+  int firstbyte;
-   size_t n; 
- 
-   // read first byte into buffer
--  if (EOF==(*wp=getc(b->f)))
-+  firstbyte = getc(b->f);
-+  if (EOF==firstbyte)
-     goto error;
-+  *wp = (char)firstbyte;
- 
-   // check how many more bytes need to be read for character
-   n = 0;
diff --git a/debian/patches/20-audio-decode-problem.diff b/debian/patches/20-audio-decode-problem.diff
index ff76d1c..066aa19 100644
--- a/debian/patches/20-audio-decode-problem.diff
+++ b/debian/patches/20-audio-decode-problem.diff
@@ -1,41 +1,19 @@
-Description: Skip package when audio decoding fail.
- Patch from upstream to keep processing when hitting
- audio packages that fail to decode.
-Author: Peter Belkner <pbelkner at snafu.de>
-Origin: upstream
+Description: Emit message when skipping package when audio decoding fail.
+Author: Petter Reinholdtsen <pere at hungry.com>
 Bug-Debian: https://bugs.debian.org/789254
-Forwarded: not-needed
+Forwarded: no
 Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2015-06-22
+Last-Update: 2015-06-23
 
-Index: bs1770gain-git/libffsox-2/ffsox_frame_reader.c
-===================================================================
---- bs1770gain-git.orig/libffsox-2/ffsox_frame_reader.c	2015-06-22 07:37:56.678454678 +0000
-+++ bs1770gain-git/libffsox-2/ffsox_frame_reader.c	2015-06-22 07:37:56.678454678 +0000
-@@ -145,8 +145,10 @@
-       }
+diff --git a/libffsox-2/ffsox_frame_reader.c b/libffsox-2/ffsox_frame_reader.c
+index d4f9f1c..0bda906 100755
+--- a/libffsox-2/ffsox_frame_reader.c
++++ b/libffsox-2/ffsox_frame_reader.c
+@@ -146,6 +146,7 @@ static int frame_reader_run(frame_reader_t *n)
  
        if ((size=avcodec_decode_audio4(cc,frame,&got_frame,pkt))<0) {
--        DMESSAGE("decoding audio");
--        return -1;
+         // skip the package.
 +        DMESSAGE("decoding audio, skipping audio package");
-+        // skip the package.
-+        pkt->size=0;
-+        return 0;
+         pkt->size=0;
+         return 0;
        }
- 
-       pkt->size-=size;
---- bs1770gain-0.4.3.orig/libffsox-2/ffsox_frame_writer.c
-+++ bs1770gain-0.4.3/libffsox-2/ffsox_frame_writer.c
-@@ -146,6 +146,11 @@ static int frame_writer_encode(frame_wri
-   if (0!=*got_packet) {
-     av_packet_rescale_ts(pkt,cc->time_base,st->time_base);
- 
-+    // where do the "magic" factor 0.5 come from?
-+    pkt->dts>>=1;
-+    pkt->pts>>=1;
-+    pkt->duration>>=1;
-+
-     if (ffsox_stream_interleaved_write(so,pkt)<0) {
-       DMESSAGE("writing packet");
-       goto write;
diff --git a/debian/patches/series b/debian/patches/series
index 1e1eede..936fc4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-10-unsigned-char-archs.diff
 20-audio-decode-problem.diff

-- 
bs1770gain packaging