[MPlayer-cvslog] r32096 - in trunk: libmpdemux/demux_ty.c libmpdemux/demux_ty_osd.c libvo/sub.h

[diego]

Author: diego
Date: Wed Sep  8 21:06:39 2010
New Revision: 32096

Log:
Move sub_justify extern declaration to libvo/sub.h, where it belongs.

Modified:
   trunk/libmpdemux/demux_ty.c
   trunk/libmpdemux/demux_ty_osd.c
   trunk/libvo/sub.h

Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c	Wed Sep  8 20:54:04 2010	(r32095)
+++ trunk/libmpdemux/demux_ty.c	Wed Sep  8 21:06:39 2010	(r32096)
@@ -39,6 +39,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
+#include "libvo/sub.h"
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "demux_ty_osd.h"
@@ -49,7 +50,6 @@
 #include "libavutil/intreadwrite.h"
 
 void skip_audio_frame( sh_audio_t *sh_audio );
-extern int sub_justify;
 
 // 2/c0: audio data
 // 3/c0: audio packet header (PES header)

Modified: trunk/libmpdemux/demux_ty_osd.c
==============================================================================
--- trunk/libmpdemux/demux_ty_osd.c	Wed Sep  8 20:54:04 2010	(r32095)
+++ trunk/libmpdemux/demux_ty_osd.c	Wed Sep  8 21:06:39 2010	(r32096)
@@ -30,8 +30,6 @@
 
 //#include "dvdauth.h"
 
-extern int sub_justify;
-
 #define TY_TEXT_MODE        ( 1 << 0 )
 #define TY_OSD_MODE         ( 1 << 1 )
 

Modified: trunk/libvo/sub.h
==============================================================================
--- trunk/libvo/sub.h	Wed Sep  8 20:54:04 2010	(r32095)
+++ trunk/libvo/sub.h	Wed Sep  8 21:06:39 2010	(r32096)
@@ -117,6 +117,7 @@ extern char *sub_cp;
 extern int sub_pos;
 extern int sub_width_p;
 extern int sub_alignment;
+extern int sub_justify;
 extern int sub_visibility;
 extern int sub_bg_color; /* subtitles background color */
 extern int sub_bg_alpha;