diff options
| author | drochner <drochner> | 2009-02-02 19:23:27 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-02-02 19:23:27 +0000 |
| commit | 663dbbd0f1c18f1d6b759dce21829b1f6a91b107 (patch) | |
| tree | 82ff90ddd9cf3f9d1b5eed31c832a4b945d4c1f6 /multimedia | |
| parent | c1210f86456bbb9754b5eeb0c259201743e51125 (diff) | |
| download | pkgsrc-663dbbd0f1c18f1d6b759dce21829b1f6a91b107.tar.gz | |
another instance of bundled ffmpeg -- add the 4xm patch, bump PKGREVISION
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gst-plugins0.10-ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/gst-plugins0.10-ffmpeg/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/gst-plugins0.10-ffmpeg/patches/patch-ac | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/multimedia/gst-plugins0.10-ffmpeg/Makefile b/multimedia/gst-plugins0.10-ffmpeg/Makefile index e0b99a66004..2e30f154892 100644 --- a/multimedia/gst-plugins0.10-ffmpeg/Makefile +++ b/multimedia/gst-plugins0.10-ffmpeg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2008/12/18 17:28:17 bjs Exp $ +# $NetBSD: Makefile,v 1.10 2009/02/02 19:23:27 drochner Exp $ # DISTNAME= gst-ffmpeg-0.10.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ diff --git a/multimedia/gst-plugins0.10-ffmpeg/distinfo b/multimedia/gst-plugins0.10-ffmpeg/distinfo index 836b0f8a6fa..b08199264dd 100644 --- a/multimedia/gst-plugins0.10-ffmpeg/distinfo +++ b/multimedia/gst-plugins0.10-ffmpeg/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.4 2008/11/05 11:42:53 wiz Exp $ +$NetBSD: distinfo,v 1.5 2009/02/02 19:23:27 drochner Exp $ SHA1 (gst-ffmpeg-0.10.3.tar.gz) = 2b6e1421c2bdcb45d6dad4c7be15270ca60ba96d RMD160 (gst-ffmpeg-0.10.3.tar.gz) = 757d682d118603becf1cad2ab6abe99e95f9e23d Size (gst-ffmpeg-0.10.3.tar.gz) = 3097803 bytes SHA1 (patch-aa) = 20c499785d844c2dc4dc5ff22898dfd95c1f6220 SHA1 (patch-ab) = 0eb0902b5b135773a93f3dd499c45ccda2bc2c12 +SHA1 (patch-ac) = 843e229f2ec1aa6f8dec99403869b304356d38d7 diff --git a/multimedia/gst-plugins0.10-ffmpeg/patches/patch-ac b/multimedia/gst-plugins0.10-ffmpeg/patches/patch-ac new file mode 100644 index 00000000000..79ccf1dec14 --- /dev/null +++ b/multimedia/gst-plugins0.10-ffmpeg/patches/patch-ac @@ -0,0 +1,20 @@ +$NetBSD: patch-ac,v 1.1 2009/02/02 19:23:27 drochner Exp $ + +--- gst-libs/ext/ffmpeg/libavformat/4xm.c.orig 2009-01-29 14:05:13.000000000 +0100 ++++ gst-libs/ext/ffmpeg/libavformat/4xm.c +@@ -159,10 +159,13 @@ static int fourxm_read_header(AVFormatCo + return AVERROR_INVALIDDATA; + } + current_track = LE_32(&header[i + 8]); ++ if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){ ++ av_log(s, AV_LOG_ERROR, "current_track too large\n"); ++ av_free(header); ++ return AVERROR_INVALIDDATA; ++ } + if (current_track + 1 > fourxm->track_count) { + fourxm->track_count = current_track + 1; +- if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack)) +- return -1; + fourxm->tracks = av_realloc(fourxm->tracks, + fourxm->track_count * sizeof(AudioTrack)); + if (!fourxm->tracks) { |