# HG changeset patch
# User diego
# Date 1283972799 0
# Node ID cc222c24104f02860f719be8da5458ac667aa03c
# Parent  bf0574ca5c57209bdfcf2b5fa5b6d5f01d215d5c
Move sub_justify extern declaration to libvo/sub.h, where it belongs.

diff -r bf0574ca5c57 -r cc222c24104f libmpdemux/demux_ty.c
--- a/libmpdemux/demux_ty.c	Wed Sep 08 18:54:04 2010 +0000
+++ b/libmpdemux/demux_ty.c	Wed Sep 08 19:06:39 2010 +0000
@@ -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)
diff -r bf0574ca5c57 -r cc222c24104f libmpdemux/demux_ty_osd.c
--- a/libmpdemux/demux_ty_osd.c	Wed Sep 08 18:54:04 2010 +0000
+++ b/libmpdemux/demux_ty_osd.c	Wed Sep 08 19:06:39 2010 +0000
@@ -30,8 +30,6 @@
 
 //#include "dvdauth.h"
 
-extern int sub_justify;
-
 #define TY_TEXT_MODE        ( 1 << 0 )
 #define TY_OSD_MODE         ( 1 << 1 )
 
diff -r bf0574ca5c57 -r cc222c24104f libvo/sub.h
--- a/libvo/sub.h	Wed Sep 08 18:54:04 2010 +0000
+++ b/libvo/sub.h	Wed Sep 08 19:06:39 2010 +0000
@@ -117,6 +117,7 @@
 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;