[SCM] FFmpeg packaging branch, ubuntu.karmic, updated. debian/0.5+svn20090706-1ubuntu3-22-g5aef7d4

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.karmic branch:
commit f6c42b70fc60e291c92cfe76757d01d66c01baac
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Oct 12 09:34:15 2009 +0200

    use patch for issue1245 from git.ffmpeg.org

diff --git a/debian/patches/issue1245.patch b/debian/patches/issue1245.patch
index 23e180a..f3ea9ca 100644
--- a/debian/patches/issue1245.patch
+++ b/debian/patches/issue1245.patch
@@ -1,13 +1,20 @@
-------------------------------------------------------------------------
-r19319 | michael | 2009-07-01 20:50:31 +0200 (Mi, 01. Jul 2009) | 3 lines
+From: michael <michael at 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
+Date: Wed, 1 Jul 2009 18:50:31 +0000 (+0000)
+Subject: Make arguments of av_set_pts_info() unsigned.
+X-Git-Url: http://git.ffmpeg.org/?p=ffmpeg;a=commitdiff_plain;h=248dc1dd4cacbb7cb27d6bc0e66ff4f902b3bdc0
 
 Make arguments of av_set_pts_info() unsigned.
 Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1
 
 
+git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19319 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
+---
+
+diff --git a/libavformat/avformat.h b/libavformat/avformat.h
+index 57faaed..2185edc 100644
 --- a/libavformat/avformat.h
 +++ b/libavformat/avformat.h
-@@ -1035,7 +1035,7 @@ AVChapter *ff_new_chapter(AVFormatContex
+@@ -963,7 +963,7 @@ AVChapter *ff_new_chapter(AVFormatContext *s, int id, AVRational time_base,
   * @param pts_den denominator to convert to seconds (MPEG: 90000)
   */
  void av_set_pts_info(AVStream *s, int pts_wrap_bits,
@@ -16,9 +23,11 @@ Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1
  
  #define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
  #define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
+diff --git a/libavformat/utils.c b/libavformat/utils.c
+index 9325e3d..b1c0363 100644
 --- a/libavformat/utils.c
 +++ b/libavformat/utils.c
-@@ -3286,7 +3286,7 @@ char *ff_data_to_hex(char *buff, const u
+@@ -3304,7 +3304,7 @@ char *ff_data_to_hex(char *buff, const uint8_t *src, int s)
  }
  
  void av_set_pts_info(AVStream *s, int pts_wrap_bits,

-- 
FFmpeg packaging