Mercurial > mplayer.hg
changeset 32012:cc222c24104f
Move sub_justify extern declaration to libvo/sub.h, where it belongs.
| author | diego |
|---|---|
| date | Wed, 08 Sep 2010 19:06:39 +0000 |
| parents | bf0574ca5c57 |
| children | 7369969407d6 |
| files | libmpdemux/demux_ty.c libmpdemux/demux_ty_osd.c libvo/sub.h |
| diffstat | 3 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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 )
--- 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;