Wed Nov 7 15:36:56 2012 UTC ()
Don't return value in a void function.


(joerg)
diff -r1.58 -r1.59 pkgsrc/multimedia/ffmpeg/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/ffmpeg/patches/patch-ffserver.c
cvs diff -r1.58 -r1.59 pkgsrc/multimedia/ffmpeg/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/distinfo 2012/11/05 12:53:08 1.58
+++ pkgsrc/multimedia/ffmpeg/Attic/distinfo 2012/11/07 15:36:56 1.59
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.58 2012/11/05 12:53:08 drochner Exp $ 1$NetBSD: distinfo,v 1.59 2012/11/07 15:36:56 joerg Exp $
2 2
3SHA1 (ffmpeg-0.10.6.tar.bz2) = 6864d54cb6d5da4fd06a170ef97bd19c7677f8d1 3SHA1 (ffmpeg-0.10.6.tar.bz2) = 6864d54cb6d5da4fd06a170ef97bd19c7677f8d1
4RMD160 (ffmpeg-0.10.6.tar.bz2) = a9eaa71cc6bc0da2508a05afc23595b836d443ff 4RMD160 (ffmpeg-0.10.6.tar.bz2) = a9eaa71cc6bc0da2508a05afc23595b836d443ff
5Size (ffmpeg-0.10.6.tar.bz2) = 5778721 bytes 5Size (ffmpeg-0.10.6.tar.bz2) = 5778721 bytes
6SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382 6SHA1 (patch-aa) = c9540d0ca0a671e9faa8b5b7847c103b515ac382
7SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f 7SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
8SHA1 (patch-ap) = 0ea32afb145b55f0186fb14b1b07568d7442ddf3 8SHA1 (patch-ap) = 0ea32afb145b55f0186fb14b1b07568d7442ddf3
9SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303 9SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303
 10SHA1 (patch-ffserver.c) = 82501fbedc6cd0e829e5524623b2697716a61df8
File Added: pkgsrc/multimedia/ffmpeg/patches/Attic/patch-ffserver.c
$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) {