From c3e345e876d062fe210a58bf2bd273105e410a04 Mon Sep 17 00:00:00 2001
From: ckuethe <ckuethe@openbsd.org>
Date: Tue, 20 Nov 2007 19:12:12 +0000
Subject: [PATCH] I just got some matroska files with multiple input audio
 streams that crashes ffmpeg unless I specifically select which streams to
 encode. Add a patch to "-map" the right streams.

---
 multimedia/pspvc/Makefile                      |  3 ++-
 multimedia/pspvc/patches/patch-src_callbacks_c | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/multimedia/pspvc/Makefile b/multimedia/pspvc/Makefile
index d168afea4dd..55ecccbdaec 100644
--- a/multimedia/pspvc/Makefile
+++ b/multimedia/pspvc/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2007/11/19 21:10:40 ckuethe Exp $
+# $OpenBSD: Makefile,v 1.2 2007/11/20 19:12:12 ckuethe Exp $
 
 COMMENT=	Video converter for the Playstation Portable
 
 V=		0.3
 DISTNAME=	pspvc-${V}
+PKGNAME=	${DISTNAME}p0
 DISTFILES=	pspvc-install-${V}.tar.gz
 CATEGORIES=	multimedia
 
diff --git a/multimedia/pspvc/patches/patch-src_callbacks_c b/multimedia/pspvc/patches/patch-src_callbacks_c
index 9d704a8f41f..219e95bb54d 100644
--- a/multimedia/pspvc/patches/patch-src_callbacks_c
+++ b/multimedia/pspvc/patches/patch-src_callbacks_c
@@ -1,5 +1,5 @@
 --- src/callbacks.c.orig	Tue Mar 13 05:02:00 2007
-+++ src/callbacks.c	Wed Nov  7 15:06:34 2007
++++ src/callbacks.c	Mon Nov 19 17:37:33 2007
 @@ -379,9 +379,9 @@ void launchffmpeg_video(struct convparam *param,gint p
  			
  
@@ -12,9 +12,16 @@
  			if(nb_threads>1)
  			{
  				args[argc++]=g_strdup("-threads");
-@@ -391,14 +391,14 @@ void launchffmpeg_video(struct convparam *param,gint p
+@@ -390,15 +390,21 @@ void launchffmpeg_video(struct convparam *param,gint p
+ 			args[argc++]=g_strdup("-y");
   			args[argc++]=g_strdup("-i");
   			args[argc++]=g_strdup_printf("%s",cparam->filename);
++			args[argc++]=g_strdup("-map");
++			args[argc++]=g_strdup("-0.0:0.0");
++			args[argc++]=g_strdup("-map");
++			args[argc++]=g_strdup("-0.1:0.1");
++			args[argc++]=g_strdup("-ac");
++			args[argc++]=g_strdup("2");
  			args[argc++]=g_strdup("-acodec");
 -			args[argc++]=g_strdup("aac");
 +			args[argc++]=g_strdup("libfaac");
@@ -29,7 +36,7 @@
  			else
  				args[argc++]=g_strdup("mpeg4");
  			args[argc++]=g_strdup("-b");
-@@ -549,7 +549,7 @@ void launchffmpeg_thumbnail(struct convparam *param,gi
+@@ -549,7 +555,7 @@ void launchffmpeg_thumbnail(struct convparam *param,gi
  //				command=g_strdup_printf("ffmpeg -y -i \"%s\" -title \"%s\" -f singlejpeg -ss 5 -vframes 1 -s %s -padtop %d -padbottom %d -an M4V%05d.THM 2>&1"
  				 //,shm_param->filename,shm_param->title,thmsize,cf,cf,shm_param->pspnum);
  			argc=0;