Update to nightly the snapshot as of 2009-06-11.

Also modularize a bit, so we can have a separate ffplay package.

Too many changes to list them.

13 files changed, 73 insertions, 350 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 60a4fe9972d..3178c922fcf 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,82 +1,34 @@
-# $NetBSD: Makefile,v 1.49 2009/05/02 16:21:44 reed Exp $
-
-DISTNAME=	ffmpeg-${DISTVERSION}
-PKGNAME=	ffmpeg-${DISTVERSION:S/-//g}
-PKGREVISION=	8
-CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_FREEBSD}
-EXTRACT_SUFX=	.tar.bz2
+# $NetBSD: Makefile,v 1.50 2009/06/12 16:25:34 ahoka Exp $
 
 MAINTAINER=	ahoka@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
-COMMENT=	MPEG decoding, encoding and streaming software
+COMMENT=	Decoding, encoding and streaming software
 
-DISTVERSION=	2008-07-27
 PKG_DESTDIR_SUPPORT=	user-destdir
-PREV_PKGPATH=	multimedia/ffmpeg-devel
-
-HAS_CONFIGURE=	YES
-USE_LIBTOOL=	YES
-USE_TOOLS+=	gmake texi2html pod2man
-
-REPLACE_PERL+=	doc/texi2pod.pl
-
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
-SUBST_FILES.conf=	ffserver.c
-SUBST_SED.conf=		-e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
-SUBST_MESSAGE.conf=	Fixing configuration path.
-
-CONFLICTS+=	ffmpeg-devel-[0-9]*
-
-PLIST_SRC+=	${PKGDIR}/PLIST
-
-CONF_FILES+=	${PREFIX}/share/examples/ffmpeg/ffserver.conf \
-		${PKG_SYSCONFDIR}/ffserver.conf
 
-MAKE_ENV+=	EXTRA_LIBS=${LIBGETOPT:Q}
-# LOCALBASE=${LOCALBASE:Q}
-
-# Let's not put garbage into /tmp
-CONFIGURE_ENV+=		TMPDIR=${WRKDIR:Q}
-
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR} \
-			--cc=${CC:Q} \
-			--prefix=${PREFIX:Q} \
-			--disable-debug \
-			--disable-vhook \
-			--enable-avfilter \
-			--enable-gpl \
+CONFIGURE_ARGS+=	--enable-avfilter \
+			--enable-avfilter-lavf \
 			--enable-postproc \
-			--enable-pthreads \
-			--enable-shared \
-			--enable-swscale \
 			--enable-libvorbis \
-			--enable-libmp3lame \
-			--disable-stripping
-
-# causes complaining about being miscompiled
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-CONFIGURE_ARGS+=	--disable-mmx \
-			--disable-mmx2 \
-			--disable-ssse3
-.endif
+			--enable-libmp3lame 
 
 INSTALLATION_DIRS=	lib share/examples/ffmpeg share/doc/ffmpeg
 
-.include "options.mk"
+CONF_FILES+=	${PREFIX}/share/examples/ffmpeg/ffserver.conf \
+		${PKG_SYSCONFDIR}/ffserver.conf
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/libavcodec/apiexample.c \
+post-install:   
+	${INSTALL_DATA} ${WRKSRC}/libavcodec/api-example.c \
 		${DESTDIR}${PREFIX}/share/doc/ffmpeg
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/doc/TODO \
 		${DESTDIR}${PREFIX}/share/doc/ffmpeg
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/ffmpeg
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt \
+		${DESTDIR}${PREFIX}/share/doc/ffmpeg
 	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
 		${DESTDIR}${PREFIX}/share/examples/ffmpeg
 
+.include "options.mk"
+
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "../../multimedia/ffmpeg/Makefile.common"
diff --git a/multimedia/ffmpeg/PLIST b/multimedia/ffmpeg/PLIST
index cd4cc1778d8..63104eb5cb1 100644
--- a/multimedia/ffmpeg/PLIST
+++ b/multimedia/ffmpeg/PLIST
@@ -1,16 +1,14 @@
-@comment $NetBSD: PLIST,v 1.11 2009/04/07 19:29:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/12 16:25:34 ahoka Exp $
 bin/ffmpeg
 bin/ffserver
-${PLIST.sdl}bin/ffplay
-${PLIST.sdl}man/man1/ffplay.1
 include/libavcodec/avcodec.h
 include/libavcodec/opt.h
+include/libavcodec/vdpau.h
+include/libavcodec/xvmc.h
 include/libavdevice/avdevice.h
 include/libavfilter/avfilter.h
 include/libavformat/avformat.h
 include/libavformat/avio.h
-include/libavformat/rtsp.h
-include/libavformat/rtspcodes.h
 include/libavutil/adler32.h
 include/libavutil/avstring.h
 include/libavutil/avutil.h
@@ -24,40 +22,39 @@ include/libavutil/lzo.h
 include/libavutil/mathematics.h
 include/libavutil/md5.h
 include/libavutil/mem.h
-include/libavutil/random.h
+include/libavutil/pixfmt.h
 include/libavutil/rational.h
 include/libavutil/sha1.h
 include/libpostproc/postprocess.h
-include/libswscale/rgb2rgb.h
 include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
-lib/libavcodec.so.51
-lib/libavcodec.so.51.61.0
+lib/libavcodec.so.52
+lib/libavcodec.so.52.30.2
 lib/libavdevice.a
 lib/libavdevice.so
 lib/libavdevice.so.52
-lib/libavdevice.so.52.0.0
+lib/libavdevice.so.52.2.0
 lib/libavfilter.a
 lib/libavfilter.so
 lib/libavfilter.so.0
-lib/libavfilter.so.0.0.0
+lib/libavfilter.so.0.5.0
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.52
-lib/libavformat.so.52.18.0
+lib/libavformat.so.52.34.0
 lib/libavutil.a
 lib/libavutil.so
-lib/libavutil.so.49
-lib/libavutil.so.49.7.0
+lib/libavutil.so.50
+lib/libavutil.so.50.3.0
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.51
-lib/libpostproc.so.51.1.0
+lib/libpostproc.so.51.2.0
 lib/libswscale.a
 lib/libswscale.so
 lib/libswscale.so.0
-lib/libswscale.so.0.5.1
+lib/libswscale.so.0.7.1
 lib/pkgconfig/libavcodec.pc
 lib/pkgconfig/libavdevice.pc
 lib/pkgconfig/libavfilter.pc
@@ -69,14 +66,34 @@ man/man1/ffmpeg.1
 man/man1/ffserver.1
 share/doc/ffmpeg/README
 share/doc/ffmpeg/TODO
-share/doc/ffmpeg/apiexample.c
+share/doc/ffmpeg/api-example.c
 share/doc/ffmpeg/avutil.txt
 share/doc/ffmpeg/ffmpeg_powerpc_performance_evaluation_howto.txt
 share/doc/ffmpeg/issue_tracker.txt
 share/doc/ffmpeg/optimization.txt
+share/doc/ffmpeg/rate_distortion.txt
 share/doc/ffmpeg/snow.txt
 share/doc/ffmpeg/soc.txt
+share/doc/ffmpeg/swscale.txt
+share/doc/ffmpeg/viterbi.txt
 share/examples/ffmpeg/ffserver.conf
+share/ffmpeg/libx264-baseline.ffpreset
+share/ffmpeg/libx264-default.ffpreset
+share/ffmpeg/libx264-fastfirstpass.ffpreset
+share/ffmpeg/libx264-hq.ffpreset
+share/ffmpeg/libx264-ipod320.ffpreset
+share/ffmpeg/libx264-ipod640.ffpreset
+share/ffmpeg/libx264-lossless_fast.ffpreset
+share/ffmpeg/libx264-lossless_max.ffpreset
+share/ffmpeg/libx264-lossless_medium.ffpreset
+share/ffmpeg/libx264-lossless_slow.ffpreset
+share/ffmpeg/libx264-lossless_slower.ffpreset
+share/ffmpeg/libx264-lossless_ultrafast.ffpreset
+share/ffmpeg/libx264-main.ffpreset
+share/ffmpeg/libx264-max.ffpreset
+share/ffmpeg/libx264-normal.ffpreset
+share/ffmpeg/libx264-slowfirstpass.ffpreset
+@dirrm share/ffmpeg
 @dirrm share/examples/ffmpeg
 @dirrm share/doc/ffmpeg
 @dirrm include/libswscale
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 3da91ea20a8..a72351e5ffb 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.22 2009/01/29 15:02:13 tron Exp $
+$NetBSD: distinfo,v 1.23 2009/06/12 16:25:34 ahoka Exp $
 
-SHA1 (ffmpeg-2008-07-27.tar.bz2) = 103acde7a0f02aa1c32d5dab5bf187c94441c479
-RMD160 (ffmpeg-2008-07-27.tar.bz2) = e69128fc034a3f8b0fd561f1e6ecc04dd118a977
-Size (ffmpeg-2008-07-27.tar.bz2) = 2581976 bytes
-SHA1 (patch-4xm) = 179f817eae8bb2ac122a2f451e13ddb22e4c23c5
-SHA1 (patch-bktr) = dddf7149810d227f531e5a198445fc0d1893bece
-SHA1 (patch-configure) = 747593b082f428ac1f79c6d9cad8773326351a83
-SHA1 (patch-imgconvert.c) = 3c0a9f98ddb767db6f46a02fc64451c0a79b1cbc
-SHA1 (patch-libavcodec_Makefile) = 14a31e2ea9080aa1cc3999e3fbb745018ac5e4de
-SHA1 (patch-mem.c) = b31dd3c0a53da58be34e5f6c0cbf36454649a85f
-SHA1 (patch-oldx246) = 730c503422727fe4b38353f5896ce62ee6f12ebe
-SHA1 (patch-r14477) = fb68f691fe68b6dc4ddd31c4c366d0dae11ab999
-SHA1 (patch-v4l2) = ed35dbd2d08337239f051c74c414e01609fb6ef6
+SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219
+RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a
+Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes
+SHA1 (patch-aa) = dadd96835ffbf3a95a5de75647a72edb53171b6f
+SHA1 (patch-bktr) = dadd96835ffbf3a95a5de75647a72edb53171b6f
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index 7e43b98cfc9..79d945f6282 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -1,18 +1,16 @@
-# $NetBSD: options.mk,v 1.11 2008/09/15 21:24:00 sborrill Exp $
+# $NetBSD: options.mk,v 1.12 2009/06/12 16:25:34 ahoka Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS=	sdl theora xvid faad faac x264
-PKG_SUGGESTED_OPTIONS=	faac theora xvid x264
+PKG_SUPPORTED_OPTIONS=	theora xvid faad faac x264
+PKG_SUGGESTED_OPTIONS=	theora xvid x264
 #PKG_OPTIONS_OPTIONAL_GROUPS=	aac-decoder
 #PKG_OPTIONS_GROUP.aac-decoder=	faad faac
 
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=	sdl swscale
-
 ###
 ### faad option
 ###
@@ -22,13 +20,13 @@ CONFIGURE_ARGS+=  --enable-libfaad
 .include "../../audio/faad2/buildlink3.mk"
 .endif
 
-
 ###
 ### faac option
 ###
 
 .if !empty(PKG_OPTIONS:Mfaac)
-CONFIGURE_ARGS+=  --enable-libfaac
+CONFIGURE_ARGS+=	--enable-libfaac \
+			--enable-nonfree
 .include "../../audio/faac/buildlink3.mk"
 .endif
 
diff --git a/multimedia/ffmpeg/patches/patch-4xm b/multimedia/ffmpeg/patches/patch-4xm
deleted file mode 100644
index 9bdb96d0351..00000000000
--- a/multimedia/ffmpeg/patches/patch-4xm
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-4xm,v 1.1 2009/01/29 15:02:13 tron Exp $
-
-Patch for buffer overflow based on this change:
-http://svn.ffmpeg.org/ffmpeg/trunk/libavformat/4xm.c?r1=16838&r2=16846
-
---- libavformat/4xm.c.orig	2009-01-29 14:33:19.000000000 +0000
-+++ libavformat/4xm.c	2009-01-29 14:37:44.000000000 +0000
-@@ -163,10 +163,12 @@
-                 return AVERROR_INVALIDDATA;
-             }
-             current_track = AV_RL32(&header[i + 8]);
-+            if((unsigned)current_track >= UINT_MAX / sizeof(AudioTrack) - 1){
-+                av_log(s, AV_LOG_ERROR, "current_track too large\n");
-+                return -1;
-+            }
-             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) {
diff --git a/multimedia/ffmpeg/patches/patch-bktr b/multimedia/ffmpeg/patches/patch-bktr
index 0a2fdcc8c92..f2586378296 100644
--- a/multimedia/ffmpeg/patches/patch-bktr
+++ b/multimedia/ffmpeg/patches/patch-bktr
@@ -1,13 +1,16 @@
-$NetBSD: patch-bktr,v 1.1 2008/09/07 23:39:38 ahoka Exp $
+$NetBSD: patch-bktr,v 1.2 2009/06/12 16:25:34 ahoka Exp $
 
---- libavdevice/bktr.c.orig	2008-06-03 18:20:54.000000000 +0200
+--- libavdevice/bktr.c.orig	2009-01-19 16:46:40.000000000 +0100
 +++ libavdevice/bktr.c
-@@ -31,7 +31,7 @@
- #elif defined (HAVE_MACHINE_IOCTL_METEOR_H) && defined (HAVE_MACHINE_IOCTL_BT848_H)
- # include <machine/ioctl_meteor.h>
- # include <machine/ioctl_bt848.h>
--#elif defined (HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H) && defined (HAVE_DEV_VIDEO_METEOR_IOCTL_BT848_H)
-+#elif defined (HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H) && defined (HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H)
- # include <dev/video/meteor/ioctl_meteor.h>
- # include <dev/video/bktr/ioctl_bt848.h>
- #elif HAVE_DEV_IC_BT8XX_H
+@@ -24,7 +24,11 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++/* u_short, u_int */
+ #define _BSD_SOURCE 1
++#ifdef __NetBSD__
++# define _NETBSD_SOURCE 1
++#endif
+ #include "libavformat/avformat.h"
+ #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
+ # include <dev/bktr/ioctl_meteor.h>
diff --git a/multimedia/ffmpeg/patches/patch-configure b/multimedia/ffmpeg/patches/patch-configure
deleted file mode 100644
index f02506753cf..00000000000
--- a/multimedia/ffmpeg/patches/patch-configure
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2008/09/11 12:08:41 joerg Exp $
-
---- configure.orig	2008-07-24 12:53:32.000000000 +0200
-+++ configure
-@@ -763,6 +763,7 @@ HAVE_LIST="
-     memalign
-     mkstemp
-     pld
-+    posix_memalign
-     ppc64
-     round
-     roundf
-@@ -891,7 +892,7 @@ rtp_muxer_deps="network rtp_protocol"
- rtsp_demuxer_deps="sdp_demuxer"
- sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
- v4l_demuxer_deps="linux_videodev_h"
--v4l2_demuxer_deps="linux_videodev2_h"
-+v4l2_demuxer_deps_any="linux_videodev2_h sys_videoio_h"
- vfwcap_demuxer_deps="capCreateCaptureWindow"
- vfwcap_demuxer_extralibs="-lvfw32"
- x11_grab_device_demuxer_deps="x11grab XShmCreateImage"
-@@ -1586,10 +1587,14 @@ enabled vis && add_cflags "-mcpu=ultrasp
- 
- # ---
- # big/little-endian test
--check_cc <<EOF || die "endian test failed"
--unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
-+check_exec <<EOF || enable bigendian
-+int main()
-+{
-+ long one= 1;
-+ return !(*((char *)(&one)));
-+}
- EOF
--od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
-+
- 
- # ---
- # check availability of some header files
-@@ -1605,6 +1610,7 @@ check_func  gethrtime
- check_func  getrusage
- check_func  inet_aton $network_extralibs
- check_func  memalign
-+check_func  posix_memalign
- check_func  mkstemp
- check_func2 windows.h GetProcessTimes
- 
-@@ -1616,7 +1622,7 @@ check_header sys/mman.h
- check_header sys/resource.h
- check_header termios.h
- 
--if ! enabled_any memalign memalign_hack && enabled need_memalign ; then
-+if ! enabled_any memalign memalign_hack posix_memalign && enabled need_memalign ; then
-     die "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack."
- fi
- 
-@@ -1789,6 +1795,7 @@ EOF
- 
- check_header linux/videodev.h
- check_header linux/videodev2.h
-+check_header sys/videoio.h
- 
- check_func2 "windows.h vfw.h" capCreateCaptureWindow -lvfw32
- 
diff --git a/multimedia/ffmpeg/patches/patch-imgconvert.c b/multimedia/ffmpeg/patches/patch-imgconvert.c
deleted file mode 100644
index 1995ccedbf8..00000000000
--- a/multimedia/ffmpeg/patches/patch-imgconvert.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libavcodec/imgconvert.c.orig	2008-09-14 21:59:57.000000000 +0100
-+++ libavcodec/imgconvert.c	2008-09-14 22:00:56.000000000 +0100
-@@ -2108,7 +2108,6 @@
- }
- #endif
- 
--#ifndef CONFIG_SWSCALE
- static uint8_t y_ccir_to_jpeg[256];
- static uint8_t y_jpeg_to_ccir[256];
- static uint8_t c_ccir_to_jpeg[256];
-@@ -2628,7 +2627,6 @@
-     avpicture_free(tmp);
-     return ret;
- }
--#endif
- 
- /* NOTE: we scan all the pixels to have an exact information */
- static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
diff --git a/multimedia/ffmpeg/patches/patch-libavcodec_Makefile b/multimedia/ffmpeg/patches/patch-libavcodec_Makefile
deleted file mode 100644
index ec1dd3fbfca..00000000000
--- a/multimedia/ffmpeg/patches/patch-libavcodec_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- libavcodec/Makefile.orig	2008-09-14 21:58:12.000000000 +0100
-+++ libavcodec/Makefile	2008-09-14 21:58:36.000000000 +0100
-@@ -373,9 +373,7 @@
- 
- OBJS-$(HAVE_XVMC)                      += xvmcvideo.o
- 
--ifndef CONFIG_SWSCALE
- OBJS += imgresample.o
--endif
- 
- # processor-specific code
- ifdef HAVE_MMX
diff --git a/multimedia/ffmpeg/patches/patch-mem.c b/multimedia/ffmpeg/patches/patch-mem.c
deleted file mode 100644
index 22453a655c5..00000000000
--- a/multimedia/ffmpeg/patches/patch-mem.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-mem.c,v 1.1 2008/09/11 12:08:41 joerg Exp $
-
---- libavutil/mem.c.orig	2008-05-23 14:37:52.000000000 +0200
-+++ libavutil/mem.c
-@@ -85,6 +85,9 @@ void *av_malloc(unsigned int size)
- 
-         btw, malloc seems to do 8 byte alignment by default here
-      */
-+#elif defined (HAVE_MEMALIGN)
-+    if (posix_memalign(&ptr, 16, size))
-+	    return NULL;
- #else
-     ptr = malloc(size);
- #endif
-@@ -95,6 +98,8 @@ void *av_realloc(void *ptr, unsigned int
- {
- #ifdef CONFIG_MEMALIGN_HACK
-     int diff;
-+#elif defined (HAVE_MEMALIGN)
-+    void *new_ptr;
- #endif
- 
-     /* let's disallow possible ambiguous cases */
-@@ -106,6 +111,18 @@ void *av_realloc(void *ptr, unsigned int
-     if(!ptr) return av_malloc(size);
-     diff= ((char*)ptr)[-1];
-     return (char*)realloc((char*)ptr - diff, size + diff) + diff;
-+#elif defined (HAVE_MEMALIGN)
-+    new_ptr = realloc(ptr, size);
-+    if (((size_t)new_ptr & 15) == 0)
-+	    return new_ptr;
-+
-+    if (posix_memalign(&ptr, 16, size)) {
-+	    free(new_ptr);
-+	    return NULL;
-+    }
-+    memcpy(ptr, new_ptr, size);
-+    free(new_ptr);
-+    return ptr;
- #else
-     return realloc(ptr, size);
- #endif
diff --git a/multimedia/ffmpeg/patches/patch-oldx246 b/multimedia/ffmpeg/patches/patch-oldx246
deleted file mode 100644
index 64d16d42c62..00000000000
--- a/multimedia/ffmpeg/patches/patch-oldx246
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-oldx246,v 1.2 2008/12/18 16:31:53 bjs Exp $
-
---- libavcodec/libx264.c.orig	2008-12-09 04:46:35.000000000 -0500
-+++ libavcodec/libx264.c
-@@ -162,7 +162,11 @@ X264_init(AVCodecContext *avctx)
- 
-     x4->params.i_bframe = avctx->max_b_frames;
-     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
-+#if X264_BUILD > 62
-+    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
-+#else
-     x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
-+#endif
-     x4->params.i_bframe_bias = avctx->bframebias;
-     x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
-     avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
-@@ -220,15 +224,18 @@ X264_init(AVCodecContext *avctx)
-         x4->params.analyse.i_me_method = X264_ME_UMH;
-     else if(avctx->me_method == ME_FULL)
-         x4->params.analyse.i_me_method = X264_ME_ESA;
-+#ifdef HAVE_X264_TESA
-     else if(avctx->me_method == ME_TESA)
-         x4->params.analyse.i_me_method = X264_ME_TESA;
-+#endif
-     else x4->params.analyse.i_me_method = X264_ME_HEX;
- 
-     x4->params.analyse.i_me_range = avctx->me_range;
-     x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
--
-+#if X264_BUILD < 65
-     x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
-     x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
-+#endif
-     x4->params.analyse.b_mixed_references =
-         avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
-     x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
-@@ -253,7 +260,9 @@ X264_init(AVCodecContext *avctx)
-     x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor);
-     x4->params.rc.f_pb_factor = avctx->b_quant_factor;
-     x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
-+#if X264_BUILD < 61
-     x4->params.rc.psz_rc_eq = avctx->rc_eq;
-+#endif
- 
-     x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
-     x4->params.i_log_level = X264_LOG_DEBUG;
diff --git a/multimedia/ffmpeg/patches/patch-r14477 b/multimedia/ffmpeg/patches/patch-r14477
deleted file mode 100644
index 60d3af07294..00000000000
--- a/multimedia/ffmpeg/patches/patch-r14477
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-r14477,v 1.1 2008/09/07 23:39:38 ahoka Exp $
-
-From ffmpeg svn. Remove after upgrading the ffmpeg.
-
---- libavformat/avidec.c	2008/07/04 13:05:06	14064
-+++ libavformat/avidec.c	2008/07/30 21:07:54	14477
-@@ -1026,8 +1026,7 @@
-             continue;
- 
- //        assert(st2->codec->block_align);
--        assert(st2->time_base.den == ast2->rate);
--        assert(st2->time_base.num == ast2->scale);
-+        assert((int64_t)st2->time_base.num*ast2->rate == (int64_t)st2->time_base.den*ast2->scale);
-         index = av_index_search_timestamp(
-                 st2,
-                 av_rescale(timestamp, st2->time_base.den*(int64_t)st->time_base.num, st->time_base.den * (int64_t)st2->time_base.num),
diff --git a/multimedia/ffmpeg/patches/patch-v4l2 b/multimedia/ffmpeg/patches/patch-v4l2
deleted file mode 100644
index b7a6ef3aade..00000000000
--- a/multimedia/ffmpeg/patches/patch-v4l2
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-v4l2,v 1.1 2008/09/07 23:39:38 ahoka Exp $
-
---- libavdevice/v4l2.c.orig	2008-07-15 22:45:42.000000000 +0200
-+++ libavdevice/v4l2.c
-@@ -34,8 +34,13 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/time.h>
--#include <asm/types.h>
--#include <linux/videodev2.h>
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+# include <sys/types.h>
-+# include <sys/videoio.h>
-+#else
-+# include <asm/types.h>
-+# include <linux/videodev2.h>
-+#endif
- #include <time.h>
- 
- static const int desired_video_buffers = 256;