[vlc-commits] NSIS/Qt extension dialog: remove duplicates

[Daniel Amm]

vlc/vlc-2.2 | branch: master | Daniel Amm <da2424 at t-online.de> | Tue Jun 23 20:00:26 2015 +0200| [21c08649d37a658c010c75bcbea0d6d01cea8298] | committer: Jean-Baptiste Kempf

NSIS/Qt extension dialog: remove duplicates

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 5f6ba92ad3530e6524c13a11e4f70b38b532ad99)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=21c08649d37a658c010c75bcbea0d6d01cea8298
---

 extras/package/win32/NSIS/helpers/extensions.nsh  |    1 -
 modules/gui/qt4/components/simple_preferences.cpp |   15 +++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/extras/package/win32/NSIS/helpers/extensions.nsh b/extras/package/win32/NSIS/helpers/extensions.nsh
index 4b15136..583d8be 100644
--- a/extras/package/win32/NSIS/helpers/extensions.nsh
+++ b/extras/package/win32/NSIS/helpers/extensions.nsh
@@ -179,7 +179,6 @@ FunctionEnd
   !insertmacro ${_action} Video ".m4v"
   !insertmacro ${_action} Video ".mkv"
   !insertmacro ${_action} Video ".mov"
-  !insertmacro ${_action} Video ".mp2"
   !insertmacro ${_action} Video ".mp2v"
   !insertmacro ${_action} Video ".mp4"
   !insertmacro ${_action} Video ".mp4v"
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index f633668..87cd67d 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -1346,14 +1346,13 @@ void SPrefsPanel::assoDialog()
     aTv( ".asf" ); aTv( ".avi" ); aTv( ".bik" ); aTv( ".divx" ); aTv( ".drc" );
     aTv( ".dv" ); aTv( ".f4v" ); aTv( ".flv" ); aTv( ".gvi" ); aTv( ".gxf" );
     aTv( ".m1v" ); aTv( ".m2t" ); aTv( ".m2v" ); aTv( ".m2ts" ); aTv( ".m4v" );
-    aTv( ".mkv" ); aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp2v" ); aTv( ".mp4" );
-    aTv( ".mp4v" ); aTv( ".mpa" ); aTv( ".mpe" ); aTv( ".mpeg" ); aTv( ".mpeg1" );
-    aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" ); aTv( ".mpv2" ); aTv( ".mts" );
-    aTv( ".mtv" ); aTv( ".mxf" ); aTv( ".nsv" ); aTv( ".nuv" ); aTv( ".ogg" );
-    aTv( ".ogm" ); aTv( ".ogx" ); aTv( ".ogv" ); aTv( ".rec" ); aTv( ".rm" );
-    aTv( ".rmvb" ); aTv( ".rpl" ); aTv( ".thp" ); aTv( ".tod" ); aTv( ".ts" );
-    aTv( ".tts" ); aTv( ".vob" ); aTv( ".vro" ); aTv( ".webm" ); aTv( ".wmv" );
-    aTv( ".xesc" );
+    aTv( ".mkv" ); aTv( ".mov" ); aTv( ".mp2v" ); aTv( ".mp4" ); aTv( ".mp4v" );
+    aTv( ".mpa" ); aTv( ".mpe" ); aTv( ".mpeg" ); aTv( ".mpeg1" ); aTv( ".mpeg2" );
+    aTv( ".mpeg4" ); aTv( ".mpg" ); aTv( ".mpv2" ); aTv( ".mts" ); aTv( ".mtv" );
+    aTv( ".mxf" ); aTv( ".nsv" ); aTv( ".nuv" ); aTv( ".ogg" ); aTv( ".ogm" );
+    aTv( ".ogx" ); aTv( ".ogv" ); aTv( ".rec" ); aTv( ".rm" ); aTv( ".rmvb" );
+    aTv( ".rpl" ); aTv( ".thp" ); aTv( ".tod" ); aTv( ".ts" ); aTv( ".tts" );
+    aTv( ".vob" ); aTv( ".vro" ); aTv( ".webm" ); aTv( ".wmv" ); aTv( ".xesc" );
     videoType->setCheckState( 0, ( i_temp > 0 ) ?
                               ( ( i_temp == videoType->childCount() ) ?
                                Qt::Checked : Qt::PartiallyChecked )