Mercurial > mplayer.hg
comparison subreader.c @ 31489:dc26022e9c27
Clean up sub-related extern declarations.
- Move sub_delay and sub_fps declarations to mpcommon.h.
- Remove redundant ass_track extern declaration.
- Add #include for sub_utf8 extern declaration.
| author | diego |
|---|---|
| date | Thu, 24 Jun 2010 17:19:49 +0000 |
| parents | 91b713df588f |
| children | b41cbf02f854 |
comparison
equal
deleted
inserted
replaced
| 31488:4b738166e825 | 31489:dc26022e9c27 |
|---|---|
| 29 #include <sys/types.h> | 29 #include <sys/types.h> |
| 30 #include <dirent.h> | 30 #include <dirent.h> |
| 31 | 31 |
| 32 #include "config.h" | 32 #include "config.h" |
| 33 #include "mp_msg.h" | 33 #include "mp_msg.h" |
| 34 #include "mpcommon.h" | |
| 34 #include "subreader.h" | 35 #include "subreader.h" |
| 36 #include "libvo/sub.h" | |
| 35 #include "stream/stream.h" | 37 #include "stream/stream.h" |
| 36 #include "libavutil/common.h" | 38 #include "libavutil/common.h" |
| 37 #include "libavutil/avstring.h" | 39 #include "libavutil/avstring.h" |
| 38 | 40 |
| 39 #ifdef CONFIG_ENCA | 41 #ifdef CONFIG_ENCA |
| 1083 } | 1085 } |
| 1084 | 1086 |
| 1085 return SUB_INVALID; // too many bad lines | 1087 return SUB_INVALID; // too many bad lines |
| 1086 } | 1088 } |
| 1087 | 1089 |
| 1088 extern int sub_utf8; | |
| 1089 int sub_utf8_prev=0; | 1090 int sub_utf8_prev=0; |
| 1090 | |
| 1091 extern float sub_delay; | |
| 1092 extern float sub_fps; | |
| 1093 | 1091 |
| 1094 #ifdef CONFIG_ICONV | 1092 #ifdef CONFIG_ICONV |
| 1095 static iconv_t icdsc = (iconv_t)(-1); | 1093 static iconv_t icdsc = (iconv_t)(-1); |
| 1096 | 1094 |
| 1097 void subcp_open (stream_t *st) | 1095 void subcp_open (stream_t *st) |