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

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Oct 12 07:41:48 UTC 2009


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

    Make arguments of av_set_pts_info() unsigned.
    
    Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1
    
    backport from 'master' branch

diff --git a/debian/patches/issue1245.patch b/debian/patches/issue1245.patch
new file mode 100644
index 0000000..23e180a
--- /dev/null
+++ b/debian/patches/issue1245.patch
@@ -0,0 +1,29 @@
+------------------------------------------------------------------------
+r19319 | michael | 2009-07-01 20:50:31 +0200 (Mi, 01. Jul 2009) | 3 lines
+
+Make arguments of av_set_pts_info() unsigned.
+Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1
+
+
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -1035,7 +1035,7 @@ AVChapter *ff_new_chapter(AVFormatContex
+  * @param pts_den denominator to convert to seconds (MPEG: 90000)
+  */
+ void av_set_pts_info(AVStream *s, int pts_wrap_bits,
+-                     int pts_num, int pts_den);
++                     unsigned int pts_num, unsigned int pts_den);
+ 
+ #define AVSEEK_FLAG_BACKWARD 1 ///< seek backward
+ #define AVSEEK_FLAG_BYTE     2 ///< seeking based on position in bytes
+--- a/libavformat/utils.c
++++ b/libavformat/utils.c
+@@ -3286,7 +3286,7 @@ char *ff_data_to_hex(char *buff, const u
+ }
+ 
+ void av_set_pts_info(AVStream *s, int pts_wrap_bits,
+-                     int pts_num, int pts_den)
++                     unsigned int pts_num, unsigned int pts_den)
+ {
+     unsigned int gcd= av_gcd(pts_num, pts_den);
+     s->pts_wrap_bits = pts_wrap_bits;
diff --git a/debian/patches/series b/debian/patches/series
index 88bafa3..adb4852 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ ffmpeg-debian_hurd.patch
 fix-qtrle-encoding-when-previous-frame-linesize.patch
 aac-regression.patch
 fix-dv-seeking.patch
+issue1245.patch
 900_doxyfile
 # fpic-ftbfs-fix.patch
 # fpic-libpostproc-fix.patch

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list