[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090609-1-10-g94629f3

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3daf9d8302baba7dd6f2f4da6179180510a5d318
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 7 09:49:57 2009 +0200

    Revert "Refreshed patches."
    
    Patch does not match the patch discription. It introduces uncommented
    changes to d/p/fix-qtrle-encoding-when-previous-frame-linesize.patch.
    
    This reverts commit b590a48eae654ba699a592ee3c9ee1ba1d9b2706.

diff --git a/debian/patches/100_kfreebsd b/debian/patches/100_kfreebsd
index bf91868..9be5740 100644
--- a/debian/patches/100_kfreebsd
+++ b/debian/patches/100_kfreebsd
@@ -3,11 +3,9 @@ Subject: [PATCH] Fix FTBFS for kfreebsd
 X-Upstream-Discussion: <http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/90686>
 
 ==========================================================================
-Index: ffmpeg-debian/configure
-===================================================================
---- ffmpeg-debian.orig/configure	2009-07-06 13:12:54.000000000 -0400
-+++ ffmpeg-debian/configure	2009-07-06 13:14:02.000000000 -0400
-@@ -1649,6 +1649,8 @@
+--- a/configure
++++ b/configure
+@@ -1640,6 +1640,8 @@
      interix)
          disable vhook
          ;;
diff --git a/debian/patches/900_doxyfile b/debian/patches/900_doxyfile
index efeaafc..04a2b74 100644
--- a/debian/patches/900_doxyfile
+++ b/debian/patches/900_doxyfile
@@ -1,9 +1,7 @@
 Exclude some directories we use for packaging.
 ==========================================================================
-Index: ffmpeg-debian/Doxyfile
-===================================================================
---- ffmpeg-debian.orig/Doxyfile	2009-07-06 13:12:54.000000000 -0400
-+++ ffmpeg-debian/Doxyfile	2009-07-06 13:13:52.000000000 -0400
+--- a/Doxyfile
++++ b/Doxyfile
 @@ -359,7 +359,7 @@
  # excluded from the INPUT source files. This way you can easily exclude a
  # subdirectory from a directory tree whose root is specified with the INPUT tag.
diff --git a/debian/patches/ffmpeg-debian_hurd.patch b/debian/patches/ffmpeg-debian_hurd.patch
index 9f10c8d..1ef33f7 100644
--- a/debian/patches/ffmpeg-debian_hurd.patch
+++ b/debian/patches/ffmpeg-debian_hurd.patch
@@ -1,10 +1,8 @@
 Fix build failures for the GNU Hurd OS
 ===================================================================
-Index: ffmpeg-debian/configure
-===================================================================
---- ffmpeg-debian.orig/configure	2009-07-06 13:13:43.000000000 -0400
-+++ ffmpeg-debian/configure	2009-07-06 13:13:49.000000000 -0400
-@@ -1651,6 +1651,9 @@
+--- a/configure
++++ b/configure
+@@ -1642,6 +1642,9 @@
          ;;
      gnu/kfreebsd)
          ;;
diff --git a/debian/patches/fix-qtrle-encoding-when-previous-frame-linesize.patch b/debian/patches/fix-qtrle-encoding-when-previous-frame-linesize.patch
index 5f2ef95..bbd1597 100644
--- a/debian/patches/fix-qtrle-encoding-when-previous-frame-linesize.patch
+++ b/debian/patches/fix-qtrle-encoding-when-previous-frame-linesize.patch
@@ -10,11 +10,16 @@ r18908 | bcoudurier | 2009-05-23 07:55:29 +0200 (Sa, 23. Mai 2009) | 1 line
 fix qtrle encoding when previous frame linesize differs, fix #998
 
 
-Index: ffmpeg-debian/libavcodec/qtrleenc.c
-===================================================================
---- ffmpeg-debian.orig/libavcodec/qtrleenc.c	2009-07-06 13:12:54.000000000 -0400
-+++ ffmpeg-debian/libavcodec/qtrleenc.c	2009-07-06 13:13:51.000000000 -0400
-@@ -126,8 +126,10 @@
+diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c
+index 171ac25..46bb573 100644
+--- a/libavcodec/qtrleenc.c
++++ b/libavcodec/qtrleenc.c
+@@ -121,18 +121,20 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t
+     /* The cost of the three different possibilities */
+     int total_bulk_cost;
+     int total_skip_cost;
+     int total_repeat_cost;
+ 
      int temp_cost;
      int j;
  
@@ -27,7 +32,17 @@ Index: ffmpeg-debian/libavcodec/qtrleenc.c
  
      s->length_table[width] = 0;
      skipcount = 0;
-@@ -240,16 +242,17 @@
+ 
+     for (i = width - 1; i >= 0; i--) {
+ 
+         if (!s->frame.key_frame && !memcmp(this_line, prev_line, s->pixel_size))
+             skipcount = FFMIN(skipcount + 1, MAX_RLE_SKIP);
+@@ -235,26 +237,27 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t
+ static int encode_frame(QtrleEncContext *s, AVFrame *p, uint8_t *buf)
+ {
+     int i;
+     int start_line = 0;
+     int end_line = s->avctx->height;
      uint8_t *orig_buf = buf;
  
      if (!s->frame.key_frame) {
@@ -49,3 +64,9 @@ Index: ffmpeg-debian/libavcodec/qtrleenc.c
                  break;
      }
  
+     bytestream_put_be32(&buf, 0);                         // CHUNK SIZE, patched later
+ 
+     if ((start_line == 0 && end_line == s->avctx->height) || start_line == s->avctx->height)
+         bytestream_put_be16(&buf, 0);                     // header
+     else {
+

-- 
FFmpeg packaging