From a0271994197cf0a255a920cba1a4080ab548997e Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 12 Aug 2009 10:30:16 +0000
Subject: [PATCH] - Add ffmpeg-devel to CONFLICTS

---
 multimedia/ffmpeg/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index bd42f0922c8f..8e6749ed0a46 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -16,6 +16,8 @@ COMMENT=	Realtime audio/video encoder/converter and streaming server
 
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 
+CONFLICTS=	ffmpeg-devel-20*
+
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
 USE_BZIP2=	yes