r253 - unstable/ffmpeg/debian/patches

Samuel Hocevar sho at alioth.debian.org
Wed Mar 28 13:46:02 CET 2007


Author: sho
Date: 2007-03-28 12:46:02 +0000 (Wed, 28 Mar 2007)
New Revision: 253

Modified:
   unstable/ffmpeg/debian/patches/070_zzuf_r7536_ogm_crash.diff
   unstable/ffmpeg/debian/patches/071_zzuf_r7537_avi_crash.diff
   unstable/ffmpeg/debian/patches/072_zzuf_r7538_mpeg_crash.diff
   unstable/ffmpeg/debian/patches/073_zzuf_r7539_asf_crash.diff
   unstable/ffmpeg/debian/patches/074_zzuf_r7561_ogm_crash.diff
   unstable/ffmpeg/debian/patches/075_zzuf_r7595_flac_crash.diff
   unstable/ffmpeg/debian/patches/076_zzuf_r7718_mpeg_infinite_loop.diff
   unstable/ffmpeg/debian/patches/077_zzuf_r7889_mpeg_crash.diff
Log:
  * Refreshed patches.


Modified: unstable/ffmpeg/debian/patches/070_zzuf_r7536_ogm_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/070_zzuf_r7536_ogm_crash.diff	2007-03-26 12:56:37 UTC (rev 252)
+++ unstable/ffmpeg/debian/patches/070_zzuf_r7536_ogm_crash.diff	2007-03-28 12:46:02 UTC (rev 253)
@@ -1,8 +1,8 @@
-Index: libavformat/ogg2.c
+Index: ffmpeg-0.cvs20060823/libavformat/ogg2.c
 ===================================================================
---- libavformat/ogg2.c	(revision 7535)
-+++ libavformat/ogg2.c	(revision 7536)
-@@ -484,7 +484,8 @@
+--- ffmpeg-0.cvs20060823.orig/libavformat/ogg2.c	2006-07-24 17:11:24.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavformat/ogg2.c	2007-03-26 15:27:23.000000000 +0200
+@@ -483,7 +483,8 @@
      url_fseek (&s->pb, end, SEEK_SET);
  
      while (!ogg_read_page (s, &i)){

Modified: unstable/ffmpeg/debian/patches/071_zzuf_r7537_avi_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/071_zzuf_r7537_avi_crash.diff	2007-03-26 12:56:37 UTC (rev 252)
+++ unstable/ffmpeg/debian/patches/071_zzuf_r7537_avi_crash.diff	2007-03-28 12:46:02 UTC (rev 253)
@@ -1,8 +1,8 @@
-Index: libavformat/avidec.c
+Index: ffmpeg-0.cvs20060823/libavformat/avidec.c
 ===================================================================
---- libavformat/avidec.c	(revision 7536)
-+++ libavformat/avidec.c	(revision 7537)
-@@ -397,7 +397,7 @@
+--- ffmpeg-0.cvs20060823.orig/libavformat/avidec.c	2007-03-26 15:27:23.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavformat/avidec.c	2007-03-26 15:27:24.000000000 +0200
+@@ -363,7 +363,7 @@
              break;
          case MKTAG('s', 't', 'r', 'f'):
              /* stream header */

Modified: unstable/ffmpeg/debian/patches/072_zzuf_r7538_mpeg_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/072_zzuf_r7538_mpeg_crash.diff	2007-03-26 12:56:37 UTC (rev 252)
+++ unstable/ffmpeg/debian/patches/072_zzuf_r7538_mpeg_crash.diff	2007-03-28 12:46:02 UTC (rev 253)
@@ -1,15 +1,15 @@
-Index: libavcodec/mpeg12.c
+Index: ffmpeg-0.cvs20060823/libavcodec/mpeg12.c
 ===================================================================
---- libavcodec/mpeg12.c	(revision 7537)
-+++ libavcodec/mpeg12.c	(revision 7538)
-@@ -3178,6 +3178,10 @@
-                             if(mpeg_field_start(s2) < 0)
-                         return -1;
+--- ffmpeg-0.cvs20060823.orig/libavcodec/mpeg12.c	2006-07-24 17:11:20.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavcodec/mpeg12.c	2007-03-26 15:34:14.000000000 +0200
+@@ -2609,6 +2609,10 @@
+                         motion_x = s->mv[dir][i][0];
+                         motion_y = s->mv[dir][i][1];
                      }
-+                if(!s2->current_picture_ptr){
++                if(!s->current_picture_ptr){
 +                    av_log(avctx, AV_LOG_ERROR, "current_picture not initalized\n");
 +                    return -1;
 +                }
  
-                 if(avctx->thread_count > 1){
-                     int threshold= (s2->mb_height*s->slice_count + avctx->thread_count/2) / avctx->thread_count;
+                     s->current_picture.motion_val[dir][xy    ][0] = motion_x;
+                     s->current_picture.motion_val[dir][xy    ][1] = motion_y;

Modified: unstable/ffmpeg/debian/patches/073_zzuf_r7539_asf_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/073_zzuf_r7539_asf_crash.diff	2007-03-26 12:56:37 UTC (rev 252)
+++ unstable/ffmpeg/debian/patches/073_zzuf_r7539_asf_crash.diff	2007-03-28 12:46:02 UTC (rev 253)
@@ -1,8 +1,8 @@
-Index: libavformat/asf.c
+Index: ffmpeg-0.cvs20060823/libavformat/asf.c
 ===================================================================
---- libavformat/asf.c	(revision 7538)
-+++ libavformat/asf.c	(revision 7539)
-@@ -601,6 +601,10 @@
+--- ffmpeg-0.cvs20060823.orig/libavformat/asf.c	2007-03-26 15:27:23.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavformat/asf.c	2007-03-26 15:27:24.000000000 +0200
+@@ -585,6 +585,10 @@
                  assert(asf->packet_replic_size >= 8);
                  // it should be always at least 8 bytes - FIXME validate
                  asf->packet_obj_size = get_le32(pb);

Modified: unstable/ffmpeg/debian/patches/074_zzuf_r7561_ogm_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/074_zzuf_r7561_ogm_crash.diff	2007-03-26 12:56:37 UTC (rev 252)
+++ unstable/ffmpeg/debian/patches/074_zzuf_r7561_ogm_crash.diff	2007-03-28 12:46:02 UTC (rev 253)
@@ -1,8 +1,8 @@
-Index: libavcodec/imgresample.c
+Index: ffmpeg-0.cvs20060823/libavcodec/imgresample.c
 ===================================================================
---- libavcodec/imgresample.c	(revision 7560)
-+++ libavcodec/imgresample.c	(revision 7561)
-@@ -672,6 +672,8 @@
+--- ffmpeg-0.cvs20060823.orig/libavcodec/imgresample.c	2007-03-26 15:27:23.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavcodec/imgresample.c	2007-03-26 15:27:24.000000000 +0200
+@@ -538,6 +538,8 @@
  
  void sws_freeContext(struct SwsContext *ctx)
  {

Modified: unstable/ffmpeg/debian/patches/075_zzuf_r7595_flac_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/075_zzuf_r7595_flac_crash.diff	2007-03-26 12:56:37 UTC (rev 252)
+++ unstable/ffmpeg/debian/patches/075_zzuf_r7595_flac_crash.diff	2007-03-28 12:46:02 UTC (rev 253)
@@ -1,8 +1,8 @@
-Index: libavcodec/flac.c
+Index: ffmpeg-0.cvs20060823/libavcodec/flac.c
 ===================================================================
---- libavcodec/flac.c	(revision 7594)
-+++ libavcodec/flac.c	(revision 7595)
-@@ -225,6 +225,10 @@
+--- ffmpeg-0.cvs20060823.orig/libavcodec/flac.c	2006-07-24 17:11:20.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavcodec/flac.c	2007-03-26 15:27:25.000000000 +0200
+@@ -173,6 +173,10 @@
      rice_order = get_bits(&s->gb, 4);
  
      samples= s->blocksize >> rice_order;

Modified: unstable/ffmpeg/debian/patches/076_zzuf_r7718_mpeg_infinite_loop.diff
===================================================================
--- unstable/ffmpeg/debian/patches/076_zzuf_r7718_mpeg_infinite_loop.diff	2007-03-26 12:56:37 UTC (rev 252)
+++ unstable/ffmpeg/debian/patches/076_zzuf_r7718_mpeg_infinite_loop.diff	2007-03-28 12:46:02 UTC (rev 253)
@@ -1,8 +1,8 @@
-Index: libavcodec/mpegvideo.c
+Index: ffmpeg-0.cvs20060823/libavcodec/mpegvideo.c
 ===================================================================
---- libavcodec/mpegvideo.c	(revision 7717)
-+++ libavcodec/mpegvideo.c	(revision 7718)
-@@ -1603,7 +1603,7 @@
+--- ffmpeg-0.cvs20060823.orig/libavcodec/mpegvideo.c	2006-08-23 12:00:03.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavcodec/mpegvideo.c	2007-03-26 15:27:25.000000000 +0200
+@@ -1578,7 +1578,7 @@
      if(s->last_picture_ptr) copy_picture(&s->last_picture, s->last_picture_ptr);
      if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr);
  

Modified: unstable/ffmpeg/debian/patches/077_zzuf_r7889_mpeg_crash.diff
===================================================================
--- unstable/ffmpeg/debian/patches/077_zzuf_r7889_mpeg_crash.diff	2007-03-26 12:56:37 UTC (rev 252)
+++ unstable/ffmpeg/debian/patches/077_zzuf_r7889_mpeg_crash.diff	2007-03-28 12:46:02 UTC (rev 253)
@@ -1,8 +1,8 @@
-Index: libavcodec/mpeg12.c
+Index: ffmpeg-0.cvs20060823/libavcodec/mpeg12.c
 ===================================================================
---- libavcodec/mpeg12.c	(revision 7888)
-+++ libavcodec/mpeg12.c	(revision 7889)
-@@ -2593,6 +2593,10 @@
+--- ffmpeg-0.cvs20060823.orig/libavcodec/mpeg12.c	2007-03-26 15:32:41.000000000 +0200
++++ ffmpeg-0.cvs20060823/libavcodec/mpeg12.c	2007-03-26 15:32:45.000000000 +0200
+@@ -2560,6 +2560,10 @@
              break;
          }
      }




More information about the Pkg-multimedia-commits mailing list