[SCM] mplayer2/master: drop patches, all applied upstream

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9cdba7d378c32297b0b12d2c464d4da4fe8caff3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jan 5 18:02:57 2012 +0100

    drop patches, all applied upstream

diff --git a/debian/patches/0001-new_libbluray_api.patch b/debian/patches/0001-new_libbluray_api.patch
deleted file mode 100644
index b85413c..0000000
--- a/debian/patches/0001-new_libbluray_api.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Description: Update to new libbluray API.
-Origin: upstream, http://git.mplayer2.org/mplayer2/commit/?id=10efda3b37d9d8f
----
- configure              |    2 +-
- stream/stream_bluray.c |   14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
---- mplayer2.orig/configure
-+++ mplayer2/configure
-@@ -5200,7 +5200,7 @@ echores "$_vcd"
- echocheck "Blu-ray support"
- if test "$_bluray" = auto ; then
-   _bluray=no
--  statement_check libbluray/bluray.h 'bd_get_title_info(0, 0)' -lbluray && _bluray=yes
-+  statement_check libbluray/bluray.h 'bd_get_title_info(0, 0, 0)' -lbluray && _bluray=yes
- fi
- if test "$_bluray" = yes ; then
-   def_bluray='#define CONFIG_LIBBLURAY 1'
---- mplayer2.orig/stream/stream_bluray.c
-+++ mplayer2/stream/stream_bluray.c
-@@ -116,7 +116,7 @@ static int bluray_stream_control(stream_
-     case STREAM_CTRL_GET_NUM_CHAPTERS: {
-         BLURAY_TITLE_INFO *ti;
- 
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
- 
-@@ -137,7 +137,7 @@ static int bluray_stream_control(stream_
-         int64_t pos;
-         int r;
- 
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
- 
-@@ -156,7 +156,7 @@ static int bluray_stream_control(stream_
-     case STREAM_CTRL_GET_NUM_ANGLES: {
-         BLURAY_TITLE_INFO *ti;
- 
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
- 
-@@ -175,7 +175,7 @@ static int bluray_stream_control(stream_
-         BLURAY_TITLE_INFO *ti;
-         int angle = *((int *) arg);
- 
--        ti = bd_get_title_info(b->bd, b->current_title);
-+        ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
-         if (!ti)
-             return STREAM_UNSUPPORTED;
- 
-@@ -238,7 +238,7 @@ static int bluray_stream_open(stream_t *
-     }
- 
-     /* check for available titles on disc */
--    title_count = bd_get_titles(bd, TITLES_RELEVANT);
-+    title_count = bd_get_titles(bd, TITLES_RELEVANT, angle);
-     mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BLURAY_TITLES=%d\n", title_count);
-     if (!title_count) {
-         mp_msg(MSGT_OPEN, MSGL_ERR,
-@@ -253,7 +253,7 @@ static int bluray_stream_open(stream_t *
-         BLURAY_TITLE_INFO *ti;
-         int sec, msec;
- 
--        ti = bd_get_title_info(bd, i);
-+        ti = bd_get_title_info(bd, i, angle);
-         if (!ti)
-             continue;
- 
-@@ -287,7 +287,7 @@ static int bluray_stream_open(stream_t *
-            "ID_BLURAY_CURRENT_TITLE=%d\n", title + 1);
- 
-     /* Get current title information */
--    info = bd_get_title_info(bd, title);
-+    info = bd_get_title_info(bd, title, angle);
-     if (!info)
-         goto err_no_info;
- 
diff --git a/debian/patches/0002-CVE-2011-3625.patch b/debian/patches/0002-CVE-2011-3625.patch
deleted file mode 100644
index 60932eb..0000000
--- a/debian/patches/0002-CVE-2011-3625.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 27b88a09c5319deb62221b8cd0ecc14cd1136e4a Mon Sep 17 00:00:00 2001
-From: reimar <reimar at b3059339-0415-0410-9bf9-f77b7e298cf2>
-Date: Thu, 19 May 2011 09:11:56 +0000
-Subject: subreader: SAMI subs: wrap line if needed
-
-Start a new line if there's no space left to append to the previous
-one.
-
-git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33471 b3059339-0415-0410-9bf9-f77b7e298cf2
----
-diff --git a/sub/subreader.c b/sub/subreader.c
-index 6acecb5..a1d2974 100644
---- a/sub/subreader.c
-+++ b/sub/subreader.c
-@@ -177,6 +177,8 @@ static subtitle *sub_read_line_sami(stream_t* st, subtitle *current,
- 	    break;
- 
- 	case 3: /* get all text until '<' appears */
-+	    if (p - text >= LINE_LEN)
-+	        sami_add_line(current, text, &p);
- 	    if (*s == '\0') break;
- 	    else if (!strncasecmp (s, "<br>", 4)) {
-                 sami_add_line(current, text, &p);
---
-cgit v0.9
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e139303..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-new_libbluray_api.patch
-0002-CVE-2011-3625.patch

-- 
mplayer2 packaging