[SCM] mplayer/master: refresh patches

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1a59c97c30af91a09bed6438dd6d71b7deef9f88
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 18 23:37:34 2013 +0100

    refresh patches

diff --git a/debian/patches/23mplayer-debug-printf.patch b/debian/patches/23mplayer-debug-printf.patch
index 7d35641..8459efb 100644
--- a/debian/patches/23mplayer-debug-printf.patch
+++ b/debian/patches/23mplayer-debug-printf.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/mplayer.c
 +++ b/mplayer.c
-@@ -846,6 +846,10 @@ static void exit_sighandler(int x)
+@@ -826,6 +826,10 @@ static void exit_sighandler(int x)
              mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGSEGV_SIGFPE);
          default:
              mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGCRASH);
diff --git a/debian/patches/50_Hurd_PATH_MAX.patch b/debian/patches/50_Hurd_PATH_MAX.patch
index e58e6a6..a12d194 100644
--- a/debian/patches/50_Hurd_PATH_MAX.patch
+++ b/debian/patches/50_Hurd_PATH_MAX.patch
@@ -136,7 +136,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
  #include <stdio.h>
  #include <limits.h>
  #include <ctype.h>
-@@ -145,7 +149,11 @@ static void id2str(const uint8_t *id, in
+@@ -146,7 +150,11 @@ static void id2str(const uint8_t *id, in
  static int find_vuk(struct bd_priv *bd, const uint8_t discid[20])
  {
      char line[1024];
@@ -148,7 +148,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
      const char *home;
      int vukfound = 0;
      stream_t *file;
-@@ -153,13 +161,23 @@ static int find_vuk(struct bd_priv *bd,
+@@ -154,13 +162,23 @@ static int find_vuk(struct bd_priv *bd,
  
      // look up discid in KEYDB.cfg to get VUK
      home = getenv("HOME");
@@ -172,7 +172,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
      id2str(discid, 20, idstr);
      while (stream_read_line(file, line, sizeof(line), 0)) {
          char *vst;
-@@ -204,23 +222,40 @@ static int bd_get_uks(struct bd_priv *bd
+@@ -205,23 +223,40 @@ static int bd_get_uks(struct bd_priv *bd
      struct AVAES *a;
      struct AVSHA *asha;
      stream_t *file;
@@ -213,7 +213,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
      buf = av_malloc(file_size);
      stream_read(file, buf, file_size);
      free_stream(file);
-@@ -411,15 +446,29 @@ static void get_clipinf(struct bd_priv *
+@@ -412,15 +447,29 @@ static void get_clipinf(struct bd_priv *
  {
      int i;
      int langmap_offset, index_offset, end_offset;
@@ -243,7 +243,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
      if (stream_read_qword(file) != AV_RB64("HDMV0200")) {
          mp_msg(MSGT_OPEN, MSGL_ERR, "Unknown clipinf format\n");
          return;
-@@ -453,7 +502,11 @@ static void get_clipinf(struct bd_priv *
+@@ -470,7 +519,11 @@ static int bd_stream_control(stream_t *s
  
  static int bd_stream_open(stream_t *s, int mode, void* opts, int* file_format)
  {
@@ -255,7 +255,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654974
  
      struct stream_priv_s* p = opts;
      struct bd_priv *bd = calloc(1, sizeof(*bd));
-@@ -489,9 +542,16 @@ static int bd_stream_open(stream_t *s, i
+@@ -507,9 +560,16 @@ static int bd_stream_open(stream_t *s, i
      // set up AES key from uk
      av_aes_init(bd->aeseed, bd->uks.keys[0].u8, 128, 0);
  

-- 
mplayer packaging