Mercurial > mplayer.hg
changeset 32060:c3b7fc7eb796
Move audio_lang / dvdsub_lang extern variable declarations to mpcommon.h.
| author | diego |
|---|---|
| date | Sat, 11 Sep 2010 11:11:10 +0000 |
| parents | 319657dba8e1 |
| children | dcdcbe7f6713 |
| files | libmpdemux/demux_mpg.c libmpdemux/demux_ogg.c libmpdemux/demux_ts.c mpcommon.h subreader.c |
| diffstat | 5 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_mpg.c Sat Sep 11 10:57:31 2010 +0000 +++ b/libmpdemux/demux_mpg.c Sat Sep 11 11:11:10 2010 +0000 @@ -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 @@ 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;
--- a/libmpdemux/demux_ogg.c Sat Sep 11 10:57:31 2010 +0000 +++ b/libmpdemux/demux_ogg.c Sat Sep 11 11:11:10 2010 +0000 @@ -164,8 +164,6 @@ #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...
--- a/libmpdemux/demux_ts.c Sat Sep 11 10:57:31 2010 +0000 +++ b/libmpdemux/demux_ts.c Sat Sep 11 11:11:10 2010 +0000 @@ -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_keep_broken=0; off_t ts_probe = 0; int audio_substream_id = -1; -extern char *audio_lang; //for -alang typedef enum {
--- a/mpcommon.h Sat Sep 11 10:57:31 2010 +0000 +++ b/mpcommon.h Sat Sep 11 11:11:10 2010 +0000 @@ -35,6 +35,9 @@ 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;
--- a/subreader.c Sat Sep 11 10:57:31 2010 +0000 +++ b/subreader.c Sat Sep 11 11:11:10 2010 +0000 @@ -57,8 +57,6 @@ 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;