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

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

The following commit has been merged in the master branch:
commit b590a48eae654ba699a592ee3c9ee1ba1d9b2706
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 6 13:16:24 2009 -0400

    Refreshed patches.

diff --git a/debian/patches/100_kfreebsd b/debian/patches/100_kfreebsd
index 9be5740..bf91868 100644
--- a/debian/patches/100_kfreebsd
+++ b/debian/patches/100_kfreebsd
@@ -3,9 +3,11 @@ Subject: [PATCH] Fix FTBFS for kfreebsd
 X-Upstream-Discussion: <http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/90686>
 
 ==========================================================================
---- a/configure
-+++ b/configure
-@@ -1640,6 +1640,8 @@
+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 @@
      interix)
          disable vhook
          ;;
diff --git a/debian/patches/900_doxyfile b/debian/patches/900_doxyfile
index 04a2b74..efeaafc 100644
--- a/debian/patches/900_doxyfile
+++ b/debian/patches/900_doxyfile
@@ -1,7 +1,9 @@
 Exclude some directories we use for packaging.
 ==========================================================================
---- a/Doxyfile
-+++ b/Doxyfile
+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
 @@ -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 1ef33f7..9f10c8d 100644
--- a/debian/patches/ffmpeg-debian_hurd.patch
+++ b/debian/patches/ffmpeg-debian_hurd.patch
@@ -1,8 +1,10 @@
 Fix build failures for the GNU Hurd OS
 ===================================================================
---- a/configure
-+++ b/configure
-@@ -1642,6 +1642,9 @@
+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 @@
          ;;
      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 bbd1597..5f2ef95 100644
--- a/debian/patches/fix-qtrle-encoding-when-previous-frame-linesize.patch
+++ b/debian/patches/fix-qtrle-encoding-when-previous-frame-linesize.patch
@@ -10,16 +10,11 @@ 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
 
 
-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;
- 
+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 @@
      int temp_cost;
      int j;
  
@@ -32,17 +27,7 @@ index 171ac25..46bb573 100644
  
      s->length_table[width] = 0;
      skipcount = 0;
- 
-     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;
+@@ -240,16 +242,17 @@
      uint8_t *orig_buf = buf;
  
      if (!s->frame.key_frame) {
@@ -64,9 +49,3 @@ index 171ac25..46bb573 100644
                  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