r744 - /unstable/libmms/debian/patches/11_fix-stream-id-crash.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Mar 30 12:24:28 2007
New Revision: 744

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=744
Log:
* Refresh patch to apply cleanly.

Modified:
    unstable/libmms/debian/patches/11_fix-stream-id-crash.patch

Modified: unstable/libmms/debian/patches/11_fix-stream-id-crash.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmms/debian/patches/11_fix-stream-id-crash.patch?rev=744&op=diff
==============================================================================
--- unstable/libmms/debian/patches/11_fix-stream-id-crash.patch (original)
+++ unstable/libmms/debian/patches/11_fix-stream-id-crash.patch Fri Mar 30 12:24:28 2007
@@ -1,10 +1,11 @@
 GNOME #347151; SF #1521441; fixes support of streams with id above 23
 http://sourceforge.net/tracker/index.php?func=detail&aid=1521441&group_id=101989&atid=630609
 
-diff -urp ../libmms-0.3.orig/src/mms.c ./src/mms.c
---- ../libmms-0.3.orig/src/mms.c	2006-07-13 14:32:20.000000000 +0200
-+++ ./src/mms.c	2007-03-27 23:15:38.000000000 +0200
-@@ -106,6 +106,13 @@ struct mms_packet_header_s {
+Index: libmms-0.3/src/mms.c
+===================================================================
+--- libmms-0.3.orig/src/mms.c	2007-03-30 14:23:54.000000000 +0200
++++ libmms-0.3/src/mms.c	2007-03-30 14:23:55.000000000 +0200
+@@ -106,6 +106,13 @@
    uint32_t  packet_seq;
  };
  
@@ -18,7 +19,7 @@
  
  struct mms_s {
  
-@@ -140,15 +147,12 @@ struct mms_s {
+@@ -140,15 +147,12 @@
    uint32_t      asf_header_read;
    int           seq_num;
    int           num_stream_ids;
@@ -35,7 +36,7 @@
    int           bandwidth;
    
    int           has_audio;
-@@ -776,9 +780,9 @@ static void interp_asf_header (mms_t *th
+@@ -777,9 +781,9 @@
            lprintf ("stream object, stream id: %d, type: %d, encrypted: %d\n",
  		   stream_id, type, encrypted);
  
@@ -48,7 +49,7 @@
  	    this->num_stream_ids++;
  	  } else {
  	    lprintf ("too many streams, skipping\n");
-@@ -796,12 +800,19 @@ static void interp_asf_header (mms_t *th
+@@ -797,12 +801,19 @@
            lprintf ("streams %d\n", streams); 
  
            for(j = 0; j < streams; j++) {
@@ -73,7 +74,7 @@
            }
          }
          break;
-@@ -913,7 +924,6 @@ int static mms_choose_best_streams(mms_i
+@@ -914,7 +925,6 @@
    int     max_arate    = 0;
    int     min_vrate    = 0;
    int     min_bw_left  = 0;
@@ -81,7 +82,7 @@
    int     bandwitdh_left;
    int     res;
  
-@@ -922,12 +932,11 @@ int static mms_choose_best_streams(mms_i
+@@ -923,12 +933,11 @@
    /* i've never seen more than one audio stream */
    lprintf("num_stream_ids=%d\n", this->num_stream_ids);
    for (i = 0; i < this->num_stream_ids; i++) {
@@ -98,7 +99,7 @@
          }
          break;
        default:
-@@ -944,13 +953,12 @@ int static mms_choose_best_streams(mms_i
+@@ -945,13 +954,12 @@
  
    min_bw_left = bandwitdh_left;
    for (i = 0; i < this->num_stream_ids; i++) {
@@ -117,7 +118,7 @@
          }
          break;
        default:
-@@ -961,13 +969,12 @@ int static mms_choose_best_streams(mms_i
+@@ -962,13 +970,12 @@
    /* choose the lower bitrate of */
    if (!video_stream && this->has_video) {
      for (i = 0; i < this->num_stream_ids; i++) {
@@ -135,7 +136,7 @@
            }
            break;
          default:
-@@ -982,10 +989,10 @@ int static mms_choose_best_streams(mms_i
+@@ -983,10 +990,10 @@
    for (i = 1; i < this->num_stream_ids; i++) {
      this->scmd_body [ (i - 1) * 6 + 2 ] = 0xFF;
      this->scmd_body [ (i - 1) * 6 + 3 ] = 0xFF;
@@ -150,7 +151,7 @@
        this->scmd_body [ (i - 1) * 6 + 6 ] = 0x00;
        this->scmd_body [ (i - 1) * 6 + 7 ] = 0x00;
      } else {
-@@ -994,17 +1001,17 @@ int static mms_choose_best_streams(mms_i
+@@ -995,17 +1002,17 @@
        this->scmd_body [ (i - 1) * 6 + 7 ] = 0x00;
        
        /* forces the asf demuxer to not choose this stream */