Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	2006/12/02 20:24:17	1.23
+++ Makefile	2006/12/08 01:24:11
@@ -3,7 +3,7 @@
 COMMENT=	"audio/video converter and streamer with bktr(4) support"
 
 DISTNAME=		ffmpeg-cvs-20060312
-PKGNAME=		${DISTNAME:S/-cvs//}p2
+PKGNAME=		${DISTNAME:S/-cvs//}p3
 SHARED_LIBS=		avutil		1.0 \
 			avcodec		7.0 \
 			avformat	7.0 \
@@ -11,6 +11,7 @@
 CATEGORIES=		graphics multimedia
 
 HOMEPAGE=		http://www.ffmpeg.org/
+MAINTAINER=		Chris Kuethe <ckuethe@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	"patents"
@@ -22,7 +23,9 @@
 MASTER_SITES=		http://www.jakemsr.com/
 
 BUILD_DEPENDS=		::textproc/texi2html
-LIB_DEPENDS=		SDL.>=4::devel/sdl
+LIB_DEPENDS=		SDL.>=4::devel/sdl \
+			faac::audio/faac \
+			faad::audio/faad
 WANTLIB=		X11 Xext c freetype m pthread ossaudio usbhid z
 
 USE_X11=		Yes
@@ -41,7 +44,11 @@
 			--enable-pp \
 			--enable-gpl \
 			--enable-pthreads \
-			--disable-debug
+			--disable-debug \
+			--enable-faac \
+			--enable-faad \
+			--extra-ldflags="-lm -L${LOCALBASE}/lib" \
+			--extra-cflags=-I${LOCALBASE}/include
 
 MAKE_FLAGS=		LIBavutil_VERSION=$(LIBavutil_VERSION) \
 			LIBavcodec_VERSION=$(LIBavcodec_VERSION) \
Index: patches/patch-libavcodec_dtsdec_c
===================================================================
RCS file: patches/patch-libavcodec_dtsdec_c
diff -N patch-libavcodec_dtsdec_c
--- /dev/null	Sat Aug 30 18:16:59 1997
+++ patches/patch-libavcodec_dtsdec_c	Fri Dec  8 01:24:11 2006
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- libavcodec/dtsdec.c.orig	Wed Jul  5 14:03:43 2006
++++ libavcodec/dtsdec.c	Wed Jul  5 14:05:15 2006
+@@ -29,10 +29,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#ifdef HAVE_MALLOC_H
+-#include <malloc.h>
+-#endif
+-
+ #define INBUF_SIZE 4096
+ #define BUFFER_SIZE 4096
+ #define HEADER_SIZE 14
Index: patches/patch-libavcodec_mem_c
===================================================================
RCS file: patches/patch-libavcodec_mem_c
diff -N patch-libavcodec_mem_c
--- /dev/null	Sat Aug 30 18:16:59 1997
+++ patches/patch-libavcodec_mem_c	Fri Dec  8 01:24:11 2006
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- libavcodec/mem.c.orig	Wed Jul  5 14:03:51 2006
++++ libavcodec/mem.c	Wed Jul  5 14:05:26 2006
+@@ -29,9 +29,7 @@
+ #undef free
+ #undef realloc
+ 
+-#ifdef HAVE_MALLOC_H
+-#include <malloc.h>
+-#endif
++#include <stdlib.h>
+ 
+ /* you can redefine av_malloc and av_free in your project to use your
+    memory allocator. You do not need to suppress this file because the