Mercurial > mplayer.hg

changeset 31426:974cfaa54e83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add declarations for open.c externally used variables to stream.h.
author diego
date Sun, 20 Jun 2010 15:53:45 +0000
parents 2392ad3cec9c
children 9494acd724a9
files cfg-common.h gui/interface.c gui/win32/interface.c stream/stream.h
diffstat 4 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-common.h	Sun Jun 20 15:43:45 2010 +0000
+++ b/cfg-common.h	Sun Jun 20 15:53:45 2010 +0000
@@ -174,8 +174,6 @@
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-extern char *cdrom_device;
-
 const m_option_t vivoopts_conf[]={
     {"version", &vivo_param_version, CONF_TYPE_INT, 0, 0, 0, NULL},
     /* audio options */
--- a/gui/interface.c	Sun Jun 20 15:43:45 2010 +0000
+++ b/gui/interface.c	Sun Jun 20 15:53:45 2010 +0000
@@ -355,7 +355,6 @@
 }
 
 extern int              stream_dump_type;
-extern int  		vcd_track;
 
 void guiLoadFont( void )
 {
--- a/gui/win32/interface.c	Sun Jun 20 15:43:45 2010 +0000
+++ b/gui/win32/interface.c	Sun Jun 20 15:53:45 2010 +0000
@@ -49,7 +49,6 @@
 #include <cdio/cdio.h>
 #endif
 
-extern int vcd_track;
 int guiWinID = 0;
 
 char *skinName = NULL;
--- a/stream/stream.h	Sun Jun 20 15:43:45 2010 +0000
+++ b/stream/stream.h	Sun Jun 20 15:53:45 2010 +0000
@@ -333,8 +333,10 @@
 extern int dvd_chapter;
 extern int dvd_last_chapter;
 extern int dvd_angle;
+extern int vcd_track;
 
 extern char * audio_stream;
+extern char *cdrom_device;
 
 typedef struct {
  int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm