[MPlayer-cvslog] r32144 - in trunk: libmpdemux/demux_mpg.c libmpdemux/demux_ogg.c libmpdemux/demux_ts.c mpcommon.h subreader.c

[diego]

Author: diego
Date: Sat Sep 11 13:11:10 2010
New Revision: 32144

Log:
Move audio_lang / dvdsub_lang extern variable declarations to mpcommon.h.

Modified:
   trunk/libmpdemux/demux_mpg.c
   trunk/libmpdemux/demux_ogg.c
   trunk/libmpdemux/demux_ts.c
   trunk/mpcommon.h
   trunk/subreader.c

Modified: trunk/libmpdemux/demux_mpg.c
==============================================================================
--- trunk/libmpdemux/demux_mpg.c	Sat Sep 11 12:57:31 2010	(r32143)
+++ trunk/libmpdemux/demux_mpg.c	Sat Sep 11 13:11:10 2010	(r32144)
@@ -26,6 +26,7 @@
 
 #include "config.h"
 #include "mp_msg.h"
+#include "mpcommon.h"
 #include "help_mp.h"
 
 #include "stream/stream.h"
@@ -59,7 +60,6 @@ typedef struct mpg_demuxer {
   int a_stream_ids[MAX_A_STREAMS];
 } mpg_demuxer_t;
 
-extern char* dvdsub_lang;
 static int mpeg_pts_error=0;
 off_t ps_probe = 0;
 

Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c	Sat Sep 11 12:57:31 2010	(r32143)
+++ trunk/libmpdemux/demux_ogg.c	Sat Sep 11 13:11:10 2010	(r32144)
@@ -164,8 +164,6 @@ typedef struct ogg_demuxer {
 #define PACKET_LEN_BITS2    0x02
 #define PACKET_IS_SYNCPOINT 0x08
 
-extern char *dvdsub_lang, *audio_lang;
-
 //-------- subtitle support - should be moved to decoder layer, and queue
 //                          - subtitles up in demuxer buffer...
 

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Sat Sep 11 12:57:31 2010	(r32143)
+++ trunk/libmpdemux/demux_ts.c	Sat Sep 11 13:11:10 2010	(r32144)
@@ -28,6 +28,7 @@
 
 #include "config.h"
 #include "mp_msg.h"
+#include "mpcommon.h"
 #include "help_mp.h"
 
 #include "stream/stream.h"
@@ -60,7 +61,6 @@ int ts_prog;
 int ts_keep_broken=0;
 off_t ts_probe = 0;
 int audio_substream_id = -1;
-extern char *audio_lang;	//for -alang
 
 typedef enum
 {

Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h	Sat Sep 11 12:57:31 2010	(r32143)
+++ trunk/mpcommon.h	Sat Sep 11 13:11:10 2010	(r32144)
@@ -35,6 +35,9 @@ extern float sub_fps;
 extern char **sub_name;
 extern char  *font_name;
 extern char  *sub_font_name;
+extern char  *audio_lang;
+extern char  *dvdsub_lang;
+
 extern float  font_factor;
 extern double force_fps;
 

Modified: trunk/subreader.c
==============================================================================
--- trunk/subreader.c	Sat Sep 11 12:57:31 2010	(r32143)
+++ trunk/subreader.c	Sat Sep 11 13:11:10 2010	(r32144)
@@ -57,8 +57,6 @@ int flip_hebrew = 1;            ///flip 
 int fribidi_flip_commas = 0;    ///flip comma when fribidi is used
 #endif
 
-extern char* dvdsub_lang;
-
 /* Maximal length of line of a subtitle */
 #define LINE_LEN 1000
 static float mpsub_position=0;