summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2012-12-19 12:53:25 +0000
committerjoerg <joerg>2012-12-19 12:53:25 +0000
commit02a8df9ca658af14d73d1f57bf2bab08056357df (patch)
tree09df9d3c9c4cd3d849476dab59fe8eac9ce0266a
parent561bb28486525ebfe55ecb8d82b381d7e01e866a (diff)
downloadpkgsrc-02a8df9ca658af14d73d1f57bf2bab08056357df.tar.gz
Don't return NULL from a void function.
-rw-r--r--multimedia/ffmpeg010/distinfo3
-rw-r--r--multimedia/ffmpeg010/patches/patch-ffserver.c13
2 files changed, 15 insertions, 1 deletions
diff --git a/multimedia/ffmpeg010/distinfo b/multimedia/ffmpeg010/distinfo
index 7c200fe2fe7..3d033a6c097 100644
--- a/multimedia/ffmpeg010/distinfo
+++ b/multimedia/ffmpeg010/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2012/12/14 19:23:43 drochner Exp $
+$NetBSD: distinfo,v 1.6 2012/12/19 12:53:25 joerg Exp $
SHA1 (ffmpeg-0.10.6.tar.bz2) = 6864d54cb6d5da4fd06a170ef97bd19c7677f8d1
RMD160 (ffmpeg-0.10.6.tar.bz2) = a9eaa71cc6bc0da2508a05afc23595b836d443ff
@@ -8,3 +8,4 @@ SHA1 (patch-ac) = 14b39a2663be41395be0faae8270e18e2ba0891f
SHA1 (patch-ap) = b67db14f412bbca036b5e6573df68b64ac5dabc2
SHA1 (patch-configure) = edc359ba50cdc90ad3ce7529f72e07970b679303
SHA1 (patch-doc_Makefile) = d74bcf7139e298ed1ce9b6efc32b00b45eea7f24
+SHA1 (patch-ffserver.c) = a2302b88c6462df42ad87734f50de6558d9a3f21
diff --git a/multimedia/ffmpeg010/patches/patch-ffserver.c b/multimedia/ffmpeg010/patches/patch-ffserver.c
new file mode 100644
index 00000000000..70cadec3c4b
--- /dev/null
+++ b/multimedia/ffmpeg010/patches/patch-ffserver.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-ffserver.c,v 1.1 2012/12/19 12:53:25 joerg Exp $
+
+--- ffserver.c.orig 2012-12-19 10:57:22.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) {