head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.8
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.6
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.4
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.2
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2010Q4:1.2.0.6
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.4
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.2
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.1.0.10
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.8
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.6
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.4
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.2
	pkgsrc-2009Q1-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2011.01.17.17.03.03;	author drochner;	state dead;
branches;
next	1.2;

1.2
date	2010.05.14.17.06.19;	author drochner;	state Exp;
branches;
next	1.1;

1.1
date	2009.02.02.19.23.27;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.3
log
@update to 0.10.11
changes:
-Synced to FFmpeg 0.6 branch
-Add mappings for all new codecs
-encoders: proxy downstream width/height/framerate
-encoders: Fix timestamps
@
text
@$NetBSD: patch-ac,v 1.2 2010/05/14 17:06:19 drochner Exp $

--- gst-libs/ext/ffmpeg/configure.orig	2010-03-06 13:11:26.000000000 +0000
+++ gst-libs/ext/ffmpeg/configure
@@@@ -2123,6 +2123,7 @@@@ case $target_os in
         nm_opts='-P -g'
         ;;
     netbsd)
+	disable need_memalign
         oss_indev_extralibs="-lossaudio"
         oss_outdev_extralibs="-lossaudio"
         ;;
@


1.2
log
@update to 0.10.10
This switches from the bundled ffmpeg library to the pkgsrc one,
although this is strongly discouraged -- the build process of the
bundled one os so f'ed up that I couldn't get it to build with
pkgsrc libtool with readonable effort.
The update is needed for some push/pull change in gstreamer which
is needed for the totem youtube plugin.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@another instance of bundled ffmpeg -- add the 4xm patch, bump PKGREVISION
@
text
@d3 10
a12 18
--- 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) {
@