Merge branch 'master' of git@git.videolan.org:vlc

diff --git a/modules/demux/playlist/ram.c b/modules/demux/playlist/ram.c
index d640c7ac22dcd7fd7abcf317637f36ef4a46eaea..57f94198b98eb419d55a62b76a7f8bcea3d2a8a1 100644 (file)
--- a/modules/demux/playlist/ram.c
+++ b/modules/demux/playlist/ram.c
@@ -51,6 +51,8 @@ http://service.real.com/help/library/guides/realone/IntroGuide/HTML/htmfiles/ram
 #include <vlc_demux.h>
 #include <vlc_charset.h>
 
+#include <ctype.h>
+
 #include "playlist.h"
 
 struct demux_sys_t

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index fb9dd8b11d4fc667abd38d0d2b7f0b9eff49fa94..a3d458891cb97f94172850a27c410aa337babdba 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -399,6 +399,7 @@ void DialogsProvider::addFromSimple( bool pl, bool go)
 {
     QStringList files = DialogsProvider::showSimpleOpen();
     int i = 0;
+       files.sort();
     foreach( const QString &file, files )
     {
         playlist_Add( THEPL, qtu( toNativeSeparators( file ) ), NULL,