[vlc-commits] subtitles: Remove unneeded clause

Hugo Beauzée-Luyssen git at videolan.org
Tue Apr 10 16:32:00 CEST 2012


vlc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Tue Apr 10 16:24:59 2012 +0200| [c517279280c28114ef0ceb1bf5e8a99cf6ce436f] | committer: Hugo Beauzée-Luyssen

subtitles: Remove unneeded clause

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

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

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 0b4cd26..1e1a6ea 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -357,8 +357,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
                     i_prio = SUB_PRIORITY_MATCH_LEFT;
                 }
             }
-            else if( i_prio == SUB_PRIORITY_NONE &&
-                j == -1 )
+            else if( j == -1 )
             {
                 /* doesn't contain the movie name, prefer files in f_dir over subdirs */
                 i_prio = SUB_PRIORITY_MATCH_NONE;



More information about the vlc-commits mailing list