Mercurial > mplayer.hg

changeset 27166:e1619590ef03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: in ifo_stream_oped() aligned the prototype to the style of the rest of the file and renamed dvd_priv to spriv (it's a stream_priv_s*, while dvd_priv is used for other purposes in the rest of the file)
author nicodvb
date Fri, 04 Jul 2008 16:03:57 +0000
parents e3b2b66834c6
children d9b61fc3c5b7
files stream/stream_dvd.c
diffstat 1 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/stream/stream_dvd.c	Fri Jul 04 16:00:07 2008 +0000
+++ b/stream/stream_dvd.c	Fri Jul 04 16:03:57 2008 +0000
@@ -1079,12 +1079,11 @@
   return STREAM_UNSUPPORTED;
 }
 
-static int
-ifo_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
+static int ifo_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
 {
     char *ext;
     char* filename;
-    struct stream_priv_s *dvd_priv;
+    struct stream_priv_s *spriv;
 
     ext = strrchr (stream->url, '.');
     if (!ext || strcasecmp (ext + 1, "ifo"))
@@ -1094,20 +1093,20 @@
 
     filename = strdup(basename(stream->url));
 
-    dvd_priv=calloc(1, sizeof(struct stream_priv_s));
-    dvd_priv->device = strdup(dirname(stream->url));
+    spriv=calloc(1, sizeof(struct stream_priv_s));
+    spriv->device = strdup(dirname(stream->url));
     if(!strncasecmp(filename,"vts_",4))
     {
-        if(sscanf(filename+3, "_%02d_", &dvd_priv->title)!=1)
-            dvd_priv->title=1;
+        if(sscanf(filename+3, "_%02d_", &spriv->title)!=1)
+            spriv->title=1;
     }else
-        dvd_priv->title=1;
+        spriv->title=1;
 
     free(filename);
     free(stream->url);
     stream->url=strdup("dvd://");
 
-    return open_s(stream, mode, dvd_priv, file_format);
+    return open_s(stream, mode, spriv, file_format);
 }
 
 const stream_info_t stream_info_dvd = {