vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Jul 7 16:31:36 2011 +0200| [d9c2129a078d86f6fda7502a1d9084e9a94918a6] | committer: Jean-Baptiste Kempf
Add .mtv extension > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d9c2129a078d86f6fda7502a1d9084e9a94918a6 --- extras/package/win32/vlc.win32.nsi.in | 1 + include/vlc_interface.h | 4 ++-- modules/gui/qt4/components/simple_preferences.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in index 7d56e94..aca5f3d 100644 --- a/extras/package/win32/vlc.win32.nsi.in +++ b/extras/package/win32/vlc.win32.nsi.in @@ -334,6 +334,7 @@ FunctionEnd !insertmacro ${_action} ".mpg" !insertmacro ${_action} ".mpv2" !insertmacro ${_action} ".mts" + !insertmacro ${_action} ".mtv" !insertmacro ${_action} ".mxf" !insertmacro ${_action} ".nsv" !insertmacro ${_action} ".nuv" diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 455f59d..a554728 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -176,7 +176,7 @@ typedef enum vlc_dialog { #define EXTENSIONS_VIDEO_CSV "asf", "avi", "divx", "dv", "f4v", "flv", "gxf", "iso", \ "m1v", "m2v", "m2t", "m2ts", "m4v", "mkv", "mov",\ "mp2", "mp4", "mpeg", "mpeg1", \ - "mpeg2", "mpeg4", "mpg", "mts", "mxf", "nuv", \ + "mpeg2", "mpeg4", "mpg", "mts", "mtv", "mxf", "nuv", \ "ogg", "ogm", "ogv", "ogx", "ps", \ "rec", "rm", "rmvb", "ts", "vob", "wmv" @@ -225,7 +225,7 @@ typedef enum vlc_dialog { #define EXTENSIONS_VIDEO "*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bin;*.divx;*.dv;*f4v;*.flv;*.gxf;*.iso;*.m1v;*.m2v;" \ "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp2v;*.mp4;*.mp4v;*.mpa;*.mpe;*.mpeg;*.mpeg1;" \ - "*.mpeg2;*.mpeg4;*.mpg;*.mpv2;*.mts;*.mxf;*.nsv;*.nuv;" \ + "*.mpeg2;*.mpeg4;*.mpg;*.mpv2;*.mts;*.mtv;*.mxf;*.nsv;*.nuv;" \ "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \ "*.rec;*.rm;*.rmvb;*.tod;*.ts;*.tts;*.vob;*.vro;*.webm;*.wmv" diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 4397337..56031c9 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -986,7 +986,7 @@ void SPrefsPanel::assoDialog() aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m2ts" ); aTv( ".m4v" ); aTv( ".mkv" ); aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" ); aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" ); - aTv( ".mts" ); aTv( ".mxf" ); + aTv( ".mts" ); aTv( ".mtv" ); aTv( ".mxf" ); aTv( ".ogg" ); aTv( ".ogm" ); aTv( ".ogx" ); aTv( ".ogv" ); aTv( ".ts" ); aTv( ".vob" ); aTv( ".vro" ); aTv( ".wmv" ); videoType->setCheckState( 0, ( i_temp > 0 ) ? _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
