[vlc-devel] commit: Subtitles detection: decode before testing the files. ( Jean-Baptiste Kempf )

git version control git at videolan.org
Sat Oct 17 23:53:21 CEST 2009


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Oct 17 23:48:45 2009 +0200| [323f59ac8be30d79bbb1f15cb3d089163dd08aef] | committer: Jean-Baptiste Kempf 

Subtitles detection: decode before testing the files.

This calls decode_URI, as does the meta.c file. I hope this is correct, feel free to revert if not.
closes #3076

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=323f59ac8be30d79bbb1f15cb3d089163dd08aef
---

 src/input/subtitles.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 30078a9..a781409 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -34,6 +34,7 @@
 #include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_charset.h>
+#include <vlc_url.h>
 
 #ifdef HAVE_DIRENT_H
 #   include <dirent.h>
@@ -260,11 +261,11 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
 
     vlc_subfn_t *result = NULL; /* unsorted results */
     char **result2; /* sorted results */
-    const char *psz_fname = psz_name_org;
 
     if( !psz_fname )
         return NULL;
 
+    const char *psz_fname = decode_URI( psz_name_org );
     if( !strncmp( psz_fname, "file://", 7 ) )
     {
         psz_fname += 7;




More information about the vlc-devel mailing list