[libdvdnav-devel] Cosmetics
Petri Hintukainen
git at videolan.org
Wed May 20 21:12:05 CEST 2015
libdvdread | branch: master | Petri Hintukainen <phintuka at gmail.com> | Wed May 20 13:40:27 2015 +0300| [2b77f469eb511b8f43e8f9b10a3b57685ec1ff3c] | committer: Jean-Baptiste Kempf
Cosmetics
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/libdvdread.git/?a=commit;h=2b77f469eb511b8f43e8f9b10a3b57685ec1ff3c
---
src/dvd_input.c | 6 +++---
src/dvd_reader.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/dvd_input.c b/src/dvd_input.c
index e412864..a5e9b1f 100644
--- a/src/dvd_input.c
+++ b/src/dvd_input.c
@@ -53,11 +53,11 @@ char * (*dvdinput_error) (dvd_input_t);
# if defined(HAVE_DLFCN_H) && !defined(USING_BUILTIN_DLFCN)
# include <dlfcn.h>
# else
-# if defined(WIN32)
+# if defined(WIN32)
/* Only needed on MINGW at the moment */
-# include "../msvc/contrib/dlfcn.c"
+# include "../msvc/contrib/dlfcn.c"
+# endif
# endif
-#endif
typedef struct dvdcss_s *dvdcss_t;
typedef struct dvdcss_stream_cb dvdcss_stream_cb;
diff --git a/src/dvd_reader.c b/src/dvd_reader.c
index 3da9633..cd65e7d 100644
--- a/src/dvd_reader.c
+++ b/src/dvd_reader.c
@@ -374,7 +374,7 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath,
if( ppath == NULL )
goto DVDOpen_error;
- path = strdup(ppath);
+ path = strdup(ppath);
if( path == NULL )
goto DVDOpen_error;
@@ -398,9 +398,9 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath,
/* maybe "host:port" url? try opening it with acCeSS library */
if( strchr(path,':') ) {
- ret_val = DVDOpenImageFile( path, NULL, NULL, have_css );
- free(path);
- return ret_val;
+ ret_val = DVDOpenImageFile( path, NULL, NULL, have_css );
+ free(path);
+ return ret_val;
}
/* If we can't stat the file, give up */
More information about the libdvdnav-devel
mailing list