Skip to content

V
vlc
Commit 29e5c380 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/demux/mkv.cpp: compilation fixes.

parent 5bc8ca51
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
modules/demux/mkv.cpp
View file @ 29e5c380
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
#ifdef HAVE_DIRENT_H #ifdef HAVE_DIRENT_H
# include <dirent.h> # include <dirent.h>
#elif defined( UNDER_CE )
# include <windows.h> /* GetFileAttributes() */
#else #else
# include "../../src/extras/dirent.h" # include "../../src/extras/dirent.h"
#endif #endif
...@@ -574,9 +572,9 @@ static int Open( vlc_object_t * p_this ) ...@@ -574,9 +572,9 @@ static int Open( vlc_object_t * p_this )
if (p_src_dir != NULL) if (p_src_dir != NULL)
{ {
while (p_file_item = readdir(p_src_dir)) while ((p_file_item = readdir(p_src_dir)))
{ {
if (p_file_item->d_namlen > 4) if (strlen(p_file_item->d_name) > 4)
{ {
s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name; s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name;
...@@ -624,7 +622,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -624,7 +622,7 @@ static int Open( vlc_object_t * p_this )
ep = new EbmlParser(p_stream, p_l0); ep = new EbmlParser(p_stream, p_l0);
bool b_this_segment_matches = false; bool b_this_segment_matches = false;
while (p_l1 = ep->Get()) while ((p_l1 = ep->Get()))
{ {
if (MKV_IS_ID(p_l1, KaxInfo)) if (MKV_IS_ID(p_l1, KaxInfo))
{ {
......
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