[SCM] idjc/master: Removed, applied upstream

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9a5173d3a554f985fdca350db554589a2580dba4
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Nov 15 12:04:11 2015 +0100

    Removed, applied upstream

diff --git a/debian/patches/implicit-declarations.patch b/debian/patches/implicit-declarations.patch
deleted file mode 100644
index 0fd20f3..0000000
--- a/debian/patches/implicit-declarations.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix implicit declarations
-Author: Sebastian Ramacher <sramacher at debian.org>
-Forwarded: https://sourceforge.net/p/idjc/patches/25/
-Last-Update: 2014-02-18
-
---- idjc-0.8.14.orig/c/avcodec_encoder.c
-+++ idjc-0.8.14/c/avcodec_encoder.c
-@@ -20,6 +20,7 @@
- #include "../config.h"
- 
- #include <stdio.h>
-+#include <string.h>
- #include "main.h"
- #include "sourceclient.h"
- 
---- idjc-0.8.14.orig/c/encoder.c
-+++ idjc-0.8.14/c/encoder.c
-@@ -19,6 +19,7 @@
- 
- #include "../config.h"
- #include "gnusource.h"
-+#include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/debian/patches/libav.patch b/debian/patches/libav.patch
deleted file mode 100644
index e73f213..0000000
--- a/debian/patches/libav.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix building with libav 9 and 10
-Author: Sebastian Ramacher <sramacher at debian.org>
-Forwarded: https://sourceforge.net/p/idjc/patches/24/
-Last-Update: 2014-02-18
-
---- a/c/avcodecdecode.c
-+++ b/c/avcodecdecode.c
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <pthread.h>
- #include <libavutil/opt.h>
-+#include <libavutil/channel_layout.h>
- #include "main.h"
- #include "xlplayer.h"
- #include "avcodecdecode.h"
-@@ -80,8 +81,8 @@
-         av_seek_frame(self->ic, -1, (int64_t)xlplayer->seek_s * AV_TIME_BASE, 0);
-         switch (self->c->codec_id)
-             {
--            case CODEC_ID_MUSEPACK7:   /* add formats here that glitch when seeked */
--            case CODEC_ID_MUSEPACK8:
-+            case AV_CODEC_ID_MUSEPACK7:   /* add formats here that glitch when seeked */
-+            case AV_CODEC_ID_MUSEPACK8:
-                 self->drop = 1.6;
-                 fprintf(stderr, "dropping %0.2f seconds of audio\n", self->drop);
-             default:
---- a/c/avcodec_encoder.c
-+++ b/c/avcodec_encoder.c
-@@ -283,7 +283,7 @@
-         if ((codec = avcodec_find_encoder_by_name(*name)))
-             return codec;
- 
--    return avcodec_find_encoder(CODEC_ID_AAC);
-+    return avcodec_find_encoder(AV_CODEC_ID_AAC);
- }
- 
- static AVCodec *aacplus_codec()
diff --git a/debian/patches/series b/debian/patches/series
index aede80e..80a8c6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-libav.patch
-implicit-declarations.patch
 desktop.patch
 man.patch

-- 
idjc packaging