diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index a1a673a24de4..c695705ba892 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2012/11/05 12:53:08 drochner Exp $
+$NetBSD: distinfo,v 1.59 2012/11/07 15:36:56 joerg Exp $
 
 SHA1 (ffmpeg-0.10.6.tar.bz2) = 6864d54cb6d5da4fd06a170ef97bd19c7677f8d1
 RMD160 (ffmpeg-0.10.6.tar.bz2) = a9eaa71cc6bc0da2508a05afc23595b836d443ff
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382
 SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
 SHA1 (patch-ap) = 0ea32afb145b55f0186fb14b1b07568d7442ddf3
 SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303
+SHA1 (patch-ffserver.c) = 82501fbedc6cd0e829e5524623b2697716a61df8
diff --git a/multimedia/ffmpeg/patches/patch-ffserver.c b/multimedia/ffmpeg/patches/patch-ffserver.c
new file mode 100644
index 000000000000..8260ffa15f20
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ffserver.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-ffserver.c,v 1.1 2012/11/07 15:36:56 joerg Exp $
+
+--- ffserver.c.orig	2012-11-06 23:43:44.000000000 +0000
++++ ffserver.c
+@@ -3806,7 +3806,7 @@ static void add_codec(FFStream *stream, 
+     AVStream *st;
+ 
+     if(stream->nb_streams >= FF_ARRAY_ELEMS(stream->streams))
+-        return NULL;
++        return;
+ 
+     /* compute default parameters */
+     switch(av->codec_type) {