Skip to content

V
vlc-2-2
Commit 4a02c9e3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Remove .ps from extensions registration.

parent 213ec3c0
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
extras/package/win32/vlc.win32.nsi.in
View file @ 4a02c9e3
...@@ -240,7 +240,6 @@ FunctionEnd ...@@ -240,7 +240,6 @@ FunctionEnd
!insertmacro ${_action} ".mts" !insertmacro ${_action} ".mts"
!insertmacro ${_action} ".mxf" !insertmacro ${_action} ".mxf"
!insertmacro ${_action} ".ogm" !insertmacro ${_action} ".ogm"
!insertmacro ${_action} ".ps"
!insertmacro ${_action} ".ts" !insertmacro ${_action} ".ts"
!insertmacro ${_action} ".vob" !insertmacro ${_action} ".vob"
!insertmacro ${_action} ".wmv" !insertmacro ${_action} ".wmv"
......
modules/gui/qt4/components/simple_preferences.cpp
View file @ 4a02c9e3
...@@ -785,7 +785,7 @@ void SPrefsPanel::assoDialog() ...@@ -785,7 +785,7 @@ void SPrefsPanel::assoDialog()
aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m2ts" ); aTv( ".m4v" ); aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m2ts" ); aTv( ".m4v" );
aTv( ".mkv" ); aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" ); aTv( ".mkv" ); aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" );
aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" ); aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" );
aTv( ".mts" ); aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ps" ); aTv( ".ts" ); aTv( ".mts" ); aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ts" );
aTv( ".vob" ); aTv( ".wmv" ); aTv( ".vob" ); aTv( ".wmv" );
videoType->setCheckState( 0, ( i_temp > 0 ) ? videoType->setCheckState( 0, ( i_temp > 0 ) ?
( ( i_temp == audioType->childCount() ) ? ( ( i_temp == audioType->childCount() ) ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment