From d94acff2955a1350274d341c8435185a5d4cfe14 Mon Sep 17 00:00:00 2001
From: Iris Ward <aditu.venyhandottir@gmail.com>
Date: Tue, 22 Sep 2015 01:10:22 +0100
Subject: [PATCH] Add PJM and PXM filters to the import movie dialog

---
 BizHawk.Client.EmuHawk/MainForm.Events.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 2d68d2746c..01663dc71f 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -455,7 +455,7 @@ namespace BizHawk.Client.EmuHawk
 				InitialDirectory = PathManager.GetRomsPath(Global.Emulator.SystemId),
 				Multiselect = true,
 				Filter = FormatFilter(
-					"Movie Files", "*.fm2;*.mc2;*.mcm;*.mmv;*.gmv;*.vbm;*.lsmv;*.fcm;*.fmv;*.vmv;*.nmv;*.smv;*.ymv;*.zmv;*.bkm",
+					"Movie Files", "*.fm2;*.mc2;*.mcm;*.mmv;*.gmv;*.vbm;*.lsmv;*.fcm;*.fmv;*.vmv;*.nmv;*.smv;*.ymv;*.zmv;*.bkm;*.pjm;*.pxm",
 					"FCEUX", "*.fm2",
 					"PCEjin/Mednafen", "*.mc2;*.mcm",
 					"Dega", "*.mmv",
@@ -469,6 +469,8 @@ namespace BizHawk.Client.EmuHawk
 					"Snes9x", "*.smv",
 					"Yabause", "*.ymv",
 					"ZSNES", "*.zmv",
+					"PSXjin", "*.pjm",
+					"PCSX", "*.pxm",
 					"BizHawk Bkm", "*.bkm",
 					"All Files", "*.*"),
 				RestoreDirectory = false