annotate gui/mplayer/pixmaps/tonguebla.xpm @ 27518:e54c9b7eb0d8

Revert bad changes to SSA/ASS subtitle packet format The following commits are reverted partially or completely: "a valid ASS line contains 9 ',' before actual text" "demux_mkv: output correctly formated ASS packets" "libass: add a new ass_process_data() to process demuxed subtitle packets" These commits converted the internal representation of SSA/ASS subtitle packets from the format used by Matroska to a custom format where each packet has contents exactly matching one line in complete SSA script files. AFAIK no files natively use such a format for muxed subtitles. The stated reason for this change was to use a format that could in principle be muxed into a maximal number of containers. SSA subtitles do not have an implicit duration so both start time and duration or end time need to be specified explicitly; the new format moved timing information inside the codec packet data so it could be muxed without modification into containers that can represent only start time at the container level. However such a change is wrong from the viewpoint of program architecture. Timing information belongs to the demuxer level, but these commits moved not only the duration but also the authoritative value of the start time to inside the codec data. Additionally the new format lost the value of the Matroska ReadOrder field which is used by MPlayer. This commit changes the internal packet format back to that used by Matroska and makes the internal Matroska demuxer output that format again. Libavformat still outputs the "new" format; it could be converted back to the Matroska format in demux_lavf.c, but I'm not adding that code at least yet. The current lavf code has similar problems as the reverted code in MPlayer, and it also currently fails to provide any way to access the value of the ReadOrder field. I hope that the lavf side will be improved; if it isn't conversion can be added later. For now I'll make MPlayer default to the internal Matroska demuxer instead of the lavf one in a separate commit.
author uau
date Mon, 08 Sep 2008 21:26:22 +0000
parents 09c3ce60f369
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
1 /* XPM */
25715
09c3ce60f369 Make xpm arrays really const (I missed that they are not strings but
reimar
parents: 23077
diff changeset
2 static const char * const tonguebla_xpm[] = {
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
3 "16 16 137 2",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
4 " c None",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
5 ". c #FC151B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
6 "+ c #F31C35",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
7 "@ c #FD4344",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
8 "# c #FA8C99",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
9 "$ c #E9080F",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
10 "% c #DDAFA4",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
11 "& c #FDD8E0",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
12 "* c #F33A41",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
13 "= c #F00807",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
14 "- c #E6DFE0",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
15 "; c #ECF6F4",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
16 "> c #E0081D",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
17 ", c #F10705",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
18 "' c #E4080E",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
19 ") c #EE0512",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
20 "! c #F80C0B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
21 "~ c #F70D0A",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
22 "{ c #EF1510",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
23 "] c #E60F0D",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
24 "^ c #DC4248",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
25 "/ c #E9383B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
26 "( c #E91E18",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
27 "_ c #F48D94",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
28 ": c #F3E2DA",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
29 "< c #E92B32",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
30 "[ c #EE0B15",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
31 "} c #F1726F",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
32 "| c #FC7680",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
33 "1 c #EE0409",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
34 "2 c #F10306",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
35 "3 c #DE5154",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
36 "4 c #7F0401",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
37 "5 c #170009",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
38 "6 c #535455",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
39 "7 c #DCD4D3",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
40 "8 c #F4F9F7",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
41 "9 c #EBEBEA",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
42 "0 c #EFFEFF",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
43 "a c #FEF1FA",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
44 "b c #F5CBCB",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
45 "c c #F4090A",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
46 "d c #E91F21",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
47 "e c #FEA7AB",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
48 "f c #EA0314",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
49 "g c #0A0203",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
50 "h c #430002",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
51 "i c #CC090F",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
52 "j c #F30407",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
53 "k c #390414",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
54 "l c #110501",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
55 "m c #4D3F3F",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
56 "n c #D60D16",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
57 "o c #E74746",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
58 "p c #850702",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
59 "q c #E60304",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
60 "r c #DC090B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
61 "s c #E91B29",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
62 "t c #BD070E",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
63 "u c #FA0202",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
64 "v c #F76364",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
65 "w c #B90601",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
66 "x c #DA0307",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
67 "y c #FE060E",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
68 "z c #F30F09",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
69 "A c #F12F34",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
70 "B c #F80409",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
71 "C c #A90405",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
72 "D c #FD020B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
73 "E c #FABDB8",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
74 "F c #E90700",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
75 "G c #F6A9A6",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
76 "H c #C71C09",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
77 "I c #CA0819",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
78 "J c #F80C06",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
79 "K c #EF0A13",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
80 "L c #FA8786",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
81 "M c #E62B35",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
82 "N c #C20502",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
83 "O c #FA0C12",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
84 "P c #E50100",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
85 "Q c #E8323C",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
86 "R c #F4B3A8",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
87 "S c #7F0C03",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
88 "T c #EF0908",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
89 "U c #F50111",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
90 "V c #F7192A",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
91 "W c #F8AAA5",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
92 "X c #DB0F11",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
93 "Y c #F71514",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
94 "Z c #DA6D61",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
95 "` c #EF887F",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
96 " . c #EE0704",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
97 ".. c #EDFCF3",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
98 "+. c #F60212",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
99 "@. c #EB0307",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
100 "#. c #E9070B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
101 "$. c #E70E0B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
102 "%. c #F9DDD9",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
103 "&. c #F6060E",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
104 "*. c #B10A0E",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
105 "=. c #F00A09",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
106 "-. c #DE0600",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
107 ";. c #F31113",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
108 ">. c #FDDFE2",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
109 ",. c #DC0909",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
110 "'. c #F10B12",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
111 "). c #F90306",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
112 "!. c #F9181F",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
113 "~. c #FCD0D1",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
114 "{. c #A9040F",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
115 "]. c #EA4754",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
116 "^. c #FA0908",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
117 "/. c #F41821",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
118 "(. c #000000",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
119 "_. c #EE090F",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
120 ":. c #ED0D06",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
121 "<. c #F76869",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
122 "[. c #850405",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
123 "}. c #F80A07",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
124 "|. c #EC0000",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
125 "1. c #F6090B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
126 "2. c #EE080A",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
127 "3. c #E82322",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
128 "4. c #E10B0B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
129 "5. c #D80507",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
130 "6. c #E58874",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
131 "7. c #E94149",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
132 "8. c #ED0A04",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
133 "9. c #F50A0E",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
134 "0. c #DD423D",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
135 "a. c #7C302B",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
136 "b. c #E41D24",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
137 "c. c #EE0A0E",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
138 "d. c #FA050E",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
139 "e. c #F40517",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
140 "f. c #B6787D",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
141 " . + @ # ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
142 " $ % & * = - ; ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
143 " > , ' ) ! ~ { ] ^ ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
144 " / ( _ : < [ } | 1 2 ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
145 " 3 4 5 6 7 8 9 0 a b c d ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
146 " e f g h i j k l m n o p q r ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
147 " s t u v w x y z A B C D ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
148 " E F G H I J K L M N O ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
149 " P Q R S T U V W X Y Z ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
150 " ` ...+.@.#.$.%.&.*.=. ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
151 " -.;.>.,.'.).!.~.{.&.]. ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
152 " ^./.(.(._.:.(.<.[.}. (. ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
153 " |.1.(.2.(.3.(.4.5.6.(. (. ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
154 " 7.8.(.(.9.0.(.a. (. (. ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
155 " b.(.c.(.d.(. (.(.(. ",
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
156 " (.(.e.f.(.(.(. (. (. "};