From d61a6ea9826e3572e22a01166fd2b474437b7d87 Mon Sep 17 00:00:00 2001
From: Dmitry Chapyshev <dmitry@reactos.org>
Date: Sun, 1 Mar 2009 14:31:31 +0000
Subject: [PATCH] - Remove duplicates

svn path=/trunk/; revision=39828
---
 reactos/boot/bootdata/packages/reactos.dff |  2 +-
 reactos/boot/bootdata/system.ini           | 28 +++++++++++-----------
 reactos/media/ini/system.ini               | 19 ---------------
 3 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 reactos/media/ini/system.ini

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 53e6ed26847..1fd92cb28ae 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -598,7 +598,7 @@ media\inf\usbstor.inf                               6
 media\inf\xboxdisp.inf                              6
 
 ; Ini Files
-media\ini\system.ini                                4
+boot\bootdata\system.ini                            4
 
 ; Subsystems
 subsystems\win32\csrss\csrss.exe                    1
diff --git a/reactos/boot/bootdata/system.ini b/reactos/boot/bootdata/system.ini
index 819b3d7f6e8..fd6d529b934 100644
--- a/reactos/boot/bootdata/system.ini
+++ b/reactos/boot/bootdata/system.ini
@@ -1,19 +1,19 @@
+[driver32]
+msacm.imaadpcm=imaadp32.acm
+msacm.msadpcm=msadp32.acm
+msacm.msg711=msg711.acm
+msacm.winemp3=winemp3.acm
+vidc.mrle=msrle32.dll
+vidc.msvc=msvidc32.dll
+vidc.cvid=iccvid.dll
+
 [mci]
 MPEGVideo=mciqtz.drv
 MPEGVideo2=mciqtz.drv
-avivideo=mciavi.drv
-cdaudio=mcicda.drv
-sequencer=mciseq.drv
+AVIVideo=mciavi32.dll
+CDAudio=mcicda.dll
+Sequencer=mciseq.dll
 vcr=mcivisca.drv
-; videodisc=mcipionr.drv
-waveaudio=mciwave.drv
+WaveAudio=mciwave.dll
 
-[drivers32]
-MSACM.imaadpcm=imaadp32.acm
-MSACM.msadpcm=msadp32.acm
-VIDC.MRLE=msrle32.dll
-; VIDC.IV50=ir50_32.dll
-; vidc.CVID=iccvid.dll
-; VIDC.IV31=ir32_32.dll
-; VIDC.IV32=ir32_32.dll
-; vidc.MSVC=msvidc32.dll
+[386enh]
diff --git a/reactos/media/ini/system.ini b/reactos/media/ini/system.ini
deleted file mode 100644
index fd6d529b934..00000000000
--- a/reactos/media/ini/system.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[driver32]
-msacm.imaadpcm=imaadp32.acm
-msacm.msadpcm=msadp32.acm
-msacm.msg711=msg711.acm
-msacm.winemp3=winemp3.acm
-vidc.mrle=msrle32.dll
-vidc.msvc=msvidc32.dll
-vidc.cvid=iccvid.dll
-
-[mci]
-MPEGVideo=mciqtz.drv
-MPEGVideo2=mciqtz.drv
-AVIVideo=mciavi32.dll
-CDAudio=mcicda.dll
-Sequencer=mciseq.dll
-vcr=mcivisca.drv
-WaveAudio=mciwave.dll
-
-[386enh]