packages (FFMPEG_0_5): ffmpeg/ffmpeg.spec, ffmpeg/meta-before-track.patch (...
glen
glen at pld-linux.org
Fri Oct 22 15:57:48 CEST 2010
Author: glen Date: Fri Oct 22 13:57:48 2010 GMT
Module: packages Tag: FFMPEG_0_5
---- Log message:
- MOV: fix crash when 'meta' occurs before first 'trak'; backport from git
(my testfile: Haabersti.MP4, issue 36491)
- rel 7
---- Files affected:
packages/ffmpeg:
ffmpeg.spec (1.193.2.7 -> 1.193.2.8) , meta-before-track.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.193.2.7 packages/ffmpeg/ffmpeg.spec:1.193.2.8
--- packages/ffmpeg/ffmpeg.spec:1.193.2.7 Wed Sep 29 17:01:03 2010
+++ packages/ffmpeg/ffmpeg.spec Fri Oct 22 15:57:43 2010
@@ -11,7 +11,7 @@
Summary(pl.UTF-8): Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
Name: ffmpeg
Version: 0.5.2
-Release: 6
+Release: 7
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# (postprocessing, ac3, xvid, x264, faad)
License: GPL v3+ with LGPL v3+ parts
@@ -24,6 +24,7 @@
Patch0: %{name}-bug-803.patch
Patch1: imagewidth.patch
Patch2: faadbin-libfaadname.patch
+Patch3: meta-before-track.patch
URL: http://www.ffmpeg.org/
BuildRequires: SDL-devel
BuildRequires: alsa-lib-devel >= 1.0.16
@@ -212,6 +213,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# package the grep result for mplayer, the result formatted as ./mplayer/configure
cat <<EOF > ffmpeg-avconfig
@@ -464,6 +466,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.193.2.8 2010/10/22 13:57:43 glen
+- MOV: fix crash when 'meta' occurs before first 'trak'; backport from git
+ (my testfile: Haabersti.MP4, issue 36491)
+- rel 7
+
Revision 1.193.2.7 2010/09/29 15:01:03 glen
- add provides ffmpeg-libs(faac) when build enabled
================================================================
Index: packages/ffmpeg/meta-before-track.patch
diff -u /dev/null packages/ffmpeg/meta-before-track.patch:1.1.2.1
--- /dev/null Fri Oct 22 15:57:48 2010
+++ packages/ffmpeg/meta-before-track.patch Fri Oct 22 15:57:43 2010
@@ -0,0 +1,32 @@
+From: alexc <alexc at 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
+Date: Tue, 3 Mar 2009 18:19:44 +0000 (+0000)
+Subject: MOV: fix crash when 'meta' occurs before first 'trak'
+X-Git-Url: http://git.ffmpeg.org/?p=ffmpeg;a=commitdiff_plain;h=b3f3355dc645ecea3326b67940925876075337a7
+
+MOV: fix crash when 'meta' occurs before first 'trak'
+
+
+git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17781 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
+---
+
+diff --git a/libavformat/mov.c b/libavformat/mov.c
+index b34326c..88f8003 100644
+--- a/libavformat/mov.c
++++ b/libavformat/mov.c
+@@ -308,10 +308,15 @@ static int mov_read_dref(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
+
+ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
+ {
+- AVStream *st = c->fc->streams[c->fc->nb_streams-1];
++ AVStream *st;
+ uint32_t type;
+ uint32_t ctype;
+
++ if (c->fc->nb_streams < 1) // meta before first trak
++ return 0;
++
++ st = c->fc->streams[c->fc->nb_streams-1];
++
+ get_byte(pb); /* version */
+ get_be24(pb); /* flags */
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.193.2.7&r2=1.193.2.8&f=u
More information about the pld-cvs-commit
mailing list