[SCM] gmerlin-avdecoder/master: Refreshed patch

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f2a9da6ef7ba553c47c6e01fc2450b44bc006f59
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jun 11 13:36:26 2012 +0200

    Refreshed patch

diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index 6670e44..eba0b57 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -2,9 +2,9 @@ Description: fix various typos that made lintian complain
 Author: IOhannes m zmölnig <zmoelnig at iem.at>
 Last-Update: 2011-01-10
 
---- a/lib/demux_nsv.c
-+++ b/lib/demux_nsv.c
-@@ -516,7 +516,7 @@
+--- gmerlin-avdecoder.orig/lib/demux_nsv.c
++++ gmerlin-avdecoder/lib/demux_nsv.c
+@@ -510,7 +510,7 @@
        else
          {
          bgav_log(ctx->opt, BGAV_LOG_WARNING, LOG_DOMAIN,
@@ -13,8 +13,8 @@ Last-Update: 2011-01-10
          }
        }
  
---- a/lib/in_rtsp.c
-+++ b/lib/in_rtsp.c
+--- gmerlin-avdecoder.orig/lib/in_rtsp.c
++++ gmerlin-avdecoder/lib/in_rtsp.c
 @@ -578,7 +578,7 @@
  
        freeaddrinfo(addr);
@@ -24,8 +24,8 @@ Last-Update: 2011-01-10
        free(ip);
        }
      else
---- a/lib/sdp.c
-+++ b/lib/sdp.c
+--- gmerlin-avdecoder.orig/lib/sdp.c
++++ gmerlin-avdecoder/lib/sdp.c
 @@ -813,7 +813,7 @@
  void bgav_sdp_dump(bgav_sdp_t * s)
    {
@@ -35,8 +35,8 @@ Last-Update: 2011-01-10
  
    bgav_dprintf( "Origin:\n");
  
---- a/po/de.po
-+++ b/po/de.po
+--- gmerlin-avdecoder.orig/po/de.po
++++ gmerlin-avdecoder/po/de.po
 @@ -165,7 +165,7 @@
  "Port base for RTP over UDP. Values of 1024 or smaller enable random ports "
  "(recommended for RTSP aware firewalls). Values larger than 1024 define the "
@@ -46,16 +46,16 @@ Last-Update: 2011-01-10
  "value."
  msgstr ""
  
-@@ -1561,7 +1561,7 @@
+@@ -1651,7 +1651,7 @@
  
- #: lib/demux_nsv.c:519
+ #: lib/demux_nsv.c:513
  msgid ""
 -"Seeking with verison 2 TOC not support due to lack of sample files.\n"
 +"Seeking with version 2 TOC not support due to lack of sample files.\n"
  "Contact the authors to solve this"
  msgstr ""
  "Suchen mit Version 2 TOC ist nicht unterstützt wegen fehlender "
-@@ -2062,7 +2062,7 @@
+@@ -2186,7 +2186,7 @@
  
  #: lib/in_rtsp.c:581
  #, c-format
@@ -64,8 +64,8 @@ Last-Update: 2011-01-10
  msgstr ""
  
  #: lib/in_rtsp.c:593
---- a/po/gmerlin-avdecoder.pot
-+++ b/po/gmerlin-avdecoder.pot
+--- gmerlin-avdecoder.orig/po/gmerlin-avdecoder.pot
++++ gmerlin-avdecoder/po/gmerlin-avdecoder.pot
 @@ -164,7 +164,7 @@
  "Port base for RTP over UDP. Values of 1024 or smaller enable random ports "
  "(recommended for RTSP aware firewalls). Values larger than 1024 define the "
@@ -75,16 +75,16 @@ Last-Update: 2011-01-10
  "value."
  msgstr ""
  
-@@ -1510,7 +1510,7 @@
+@@ -1594,7 +1594,7 @@
  
- #: lib/demux_nsv.c:519
+ #: lib/demux_nsv.c:513
  msgid ""
 -"Seeking with verison 2 TOC not support due to lack of sample files.\n"
 +"Seeking with version 2 TOC not support due to lack of sample files.\n"
  "Contact the authors to solve this"
  msgstr ""
  
-@@ -2001,7 +2001,7 @@
+@@ -2115,7 +2115,7 @@
  
  #: lib/in_rtsp.c:581
  #, c-format
@@ -93,8 +93,8 @@ Last-Update: 2011-01-10
  msgstr ""
  
  #: lib/in_rtsp.c:593
---- a/plugins/i_avdec.c
-+++ b/plugins/i_avdec.c
+--- gmerlin-avdecoder.orig/plugins/i_avdec.c
++++ gmerlin-avdecoder/plugins/i_avdec.c
 @@ -260,7 +260,7 @@
        .val_min =     { .val_i =     0 },
        .val_max =     { .val_i = 65530 },

-- 
gmerlin-avdecoder packaging