[MPlayer-dev-eng] [PATCH] support for new subtitle format

[Salvatore Falco]

Hi all!

This patch is to add support for Jacosub subtitles format, and is
made against 20021028 cvs snapshot.
Jacosub is a well known format in Japanese animation fansub.

The patch in 'patch_Jacosub_1028.h.diff' adds a new #define for
this format (number 12).

The patch in 'patch_Jacosub_1028.c.diff' adds a new sub_read_line_x
to read lines from a Jacosub script, the code to autodetect Jacosub
subtitles and the typical script exstension.

Bye all,
    Salvatore Falco

-------------- next part --------------
LS0tIHN1YnJlYWRlci5jLm9yaWcJMjAwMi0xMC0xNyAwMjo1MzoxNC4wMDAwMDAwMDAgKzAyMDAK
KysrIHN1YnJlYWRlci5jCTIwMDItMTAtMjkgMDE6MDg6NDEuMDAwMDAwMDAwICswMTAwCkBAIC02
MDMsNiArNjAzLDE5NiBAQAogICAgIHJldHVybiBjdXJyZW50OwogfQogCitzdWJ0aXRsZSAqc3Vi
X3JlYWRfbGluZV9qYWNvc3ViKEZJTEUgKiBmZCwgc3VidGl0bGUgKiBjdXJyZW50KQoreworICAg
IGNoYXIgY29tbWFuZHNbTElORV9MRU5dLCBsaW5lMVtMSU5FX0xFTl0sIGxpbmUyW0xJTkVfTEVO
XSwKKwl0ZXh0W0xJTkVfTEVOXSwgKnAsICpxOworICAgIGludCBhMSwgYTIsIGEzLCBhNCwgYjEs
IGIyLCBiMywgYjQsIGNvbW1lbnQgPSAwOworICAgIHVuc2lnbmVkIHNob3J0IGRpcmVjdGl2ZSA9
IDA7CisKKyAgICBiemVybyhjdXJyZW50LCBzaXplb2Yoc3VidGl0bGUpKTsKKyAgICBiemVybyhj
b21tYW5kcywgc2l6ZW9mKGNoYXIpICogTElORV9MRU4pOworICAgIGJ6ZXJvKGxpbmUxLCBzaXpl
b2YoY2hhcikgKiBMSU5FX0xFTik7CisgICAgYnplcm8obGluZTIsIHNpemVvZihjaGFyKSAqIExJ
TkVfTEVOKTsKKyAgICB3aGlsZSAoIWN1cnJlbnQtPnRleHRbMF0pIHsKKwlpZiAoIWZnZXRzKGxp
bmUxLCBMSU5FX0xFTiwgZmQpKQorCSAgICByZXR1cm4gTlVMTDsKKwlpZiAoc3NjYW5mCisJICAg
IChsaW5lMSwgIiVkOiVkOiVkLiVkICVkOiVkOiVkLiVkICVbXlxuXHJdIiwgJmExLCAmYTIsICZh
MywgJmE0LAorCSAgICAgJmIxLCAmYjIsICZiMywgJmI0LCBsaW5lMikgPCA5KQorCSAgICBjb250
aW51ZTsKKwkvL2EgSmFjb3N1YiBzY3JpcHQgKm1heSogaGF2ZSBzb21lIGNvbW1hbmRzIGJlZm9y
ZSB0aGUgdGV4dCwgc28gbGV0J3MgcmVjb2duaXplIHRoZW0gCisJc3dpdGNoICh0b3VwcGVyKGxp
bmUyWzBdKSkgeworCWNhc2UgJ0MnOgorCSAgICBzd2l0Y2ggKHRvdXBwZXIobGluZTJbMV0pKSB7
CisJICAgIGNhc2UgJ0YnOgorCSAgICBjYXNlICdQJzoKKwkgICAgY2FzZSAnUyc6CisJICAgIGNh
c2UgJ0InOgorCQlpZiAoaXNkaWdpdChsaW5lMlsyXSkpCisJCSAgICBkaXJlY3RpdmUgPSAxOwor
CSAgICB9CisJICAgIGJyZWFrOworCWNhc2UgJ0QnOgorCSAgICBpZiAoKGxpbmUyWzFdID09ICcg
JykgfHwgaXNkaWdpdChsaW5lMlsxXSkpCisJCWRpcmVjdGl2ZSA9IDE7CisJICAgIC8vIHNwZWNp
YWwgY2FzZQorCSAgICBpZiAodG91cHBlcihsaW5lMlsxXSkgPT0gJ0MnKQorCQlkaXJlY3RpdmUg
PSAxOworCSAgICBicmVhazsKKwljYXNlICdFJzoKKwkgICAgc3dpdGNoICh0b3VwcGVyKGxpbmUy
WzFdKSkgeworCSAgICBjYXNlICdEJzoKKwkgICAgY2FzZSAnUCc6CisJCWlmIChpc2RpZ2l0KGxp
bmUyWzJdKSkKKwkJICAgIGRpcmVjdGl2ZSA9IDE7CisJCWJyZWFrOworCSAgICBjYXNlICdJJzoK
KwkJaWYgKCh0b3VwcGVyKGxpbmUyWzJdKSA9PSAnTycpICYmIChpc2RpZ2l0KGxpbmUyWzNdKSkp
CisJCSAgICBkaXJlY3RpdmUgPSAxOworCQlicmVhazsKKwkgICAgY2FzZSAnUic6CisJCWlmICgo
dG91cHBlcihsaW5lMlsyXSkgPT0gJ0QnKSAmJiAoaXNkaWdpdChsaW5lMlszXSkpKQorCQkgICAg
ZGlyZWN0aXZlID0gMTsKKwkJYnJlYWs7CisJICAgIGNhc2UgJ1cnOgorCQlpZiAoKHRvdXBwZXIo
bGluZTJbMl0pID09ICdMJykKKwkJICAgIHx8ICh0b3VwcGVyKGxpbmUyWzJdKSA9PSAnUicpKQor
CQkgICAgZGlyZWN0aXZlID0gMTsKKwkJYnJlYWs7CisJICAgIH0KKwkgICAgYnJlYWs7CisJY2Fz
ZSAnRic6CisJICAgIGlmIChpc2RpZ2l0KGxpbmUyWzFdKSkKKwkJZGlyZWN0aXZlID0gMTsKKwkg
ICAgZWxzZQorCQlzd2l0Y2ggKHRvdXBwZXIobGluZTJbMV0pKSB7CisJCWNhc2UgJ08nOgorCQkg
ICAgaWYgKGlzZGlnaXQobGluZTJbMl0pKQorCQkJZGlyZWN0aXZlID0gMTsKKwkJICAgIGJyZWFr
OworCQljYXNlICdTJzoKKwkJICAgIGRpcmVjdGl2ZSA9IDE7CisJCX0KKwkgICAgYnJlYWs7CisJ
Y2FzZSAnRyc6CisJICAgIGlmICgobGluZTJbMV0gPT0gJ0cnKSAmJiAoaXNkaWdpdChsaW5lMlsy
XSkpKQorCQlkaXJlY3RpdmUgPSAyOworCSAgICBicmVhazsKKwljYXNlICdIJzoKKwkgICAgc3dp
dGNoICh0b3VwcGVyKGxpbmUyWzFdKSkgeworCSAgICBjYXNlICdMJzoKKwkgICAgY2FzZSAnUic6
CisJCWlmIChpc2RpZ2l0KGxpbmUyWzJdKSkKKwkJICAgIGRpcmVjdGl2ZSA9IDE7CisJICAgIH0K
KwkgICAgYnJlYWs7CisJY2FzZSAnSic6CisJICAgIHN3aXRjaCAodG91cHBlcihsaW5lMlsxXSkp
IHsKKwkgICAgY2FzZSAnQic6CisJCWlmICh0b3VwcGVyKGxpbmUyWzJdKSA9PSAnQycpCisJCSAg
ICBkaXJlY3RpdmUgPSAxOworCQlicmVhazsKKwkgICAgY2FzZSAnQyc6CisJICAgIGNhc2UgJ0wn
OgorCSAgICBjYXNlICdSJzoKKwkJZGlyZWN0aXZlID0gMTsKKwkJYnJlYWs7CisJICAgIGNhc2Ug
J0YnOgorCQlpZiAoKGxpbmUyWzJdID09ICc6JykgJiYgKHRvdXBwZXIobGluZTJbM10pID09ICdM
JykpCisJCSAgICBkaXJlY3RpdmUgPSAxOworCSAgICB9CisJICAgIGJyZWFrOworCWNhc2UgJ1In
OgorCSAgICBpZiAoKCh0b3VwcGVyKGxpbmUyWzFdKSA9PSAnRCcpICYmICh0b3VwcGVyKGxpbmUy
WzJdKSA9PSAnQicpKQorCQl8fCAoKHRvdXBwZXIobGluZTJbMV0pID09ICdEJykKKwkJICAgICYm
ICh0b3VwcGVyKGxpbmUyWzJdKSA9PSAnQycpKQorCQl8fCAoKHRvdXBwZXIobGluZTJbMV0pID09
ICdMJykKKwkJICAgICYmICh0b3VwcGVyKGxpbmUyWzJdKSA9PSAnQicpKSkKKwkJZGlyZWN0aXZl
ID0gMjsKKwkgICAgYnJlYWs7CisJY2FzZSAnVic6CisJICAgIHN3aXRjaCAodG91cHBlcihsaW5l
MlsxXSkpIHsKKwkgICAgY2FzZSAnQSc6CisJICAgIGNhc2UgJ0InOgorCSAgICBjYXNlICdNJzoK
KwkgICAgY2FzZSAnVCc6CisJICAgIGNhc2UgJ1UnOgorCQlkaXJlY3RpdmUgPSAxOworCQlicmVh
azsKKwkgICAgY2FzZSAnTCc6CisJICAgIGNhc2UgJ1AnOgorCQlpZiAoaXNkaWdpdChsaW5lMlsy
XSkpCisJCSAgICBkaXJlY3RpdmUgPSAxOworCSAgICB9CisJICAgIGJyZWFrOworCWNhc2UgJ1sn
OgorCSAgICBkaXJlY3RpdmUgPSAxOworCSAgICBicmVhazsKKwljYXNlICd+JzoKKwkgICAgZGly
ZWN0aXZlID0gMjsKKwl9CisJaWYgKGRpcmVjdGl2ZSA9PSAxKSB7CisJICAgIHN0cmNweShsaW5l
MSwgbGluZTIpOworCSAgICBzc2NhbmYobGluZTEsICIlcyAlW15cblxyXSIsIGNvbW1hbmRzLCBs
aW5lMik7CisJfSBlbHNlIGlmIChkaXJlY3RpdmUgPT0gMikgeworCSAgICBjb250aW51ZTsKKwl9
CisJY3VycmVudC0+c3RhcnQgPSBhMSAqIDM2MDAwMCArIGEyICogNjAwMCArIGEzICogMTAwICsg
YTQ7CisJY3VycmVudC0+ZW5kID0gYjEgKiAzNjAwMDAgKyBiMiAqIDYwMDAgKyBiMyAqIDEwMCAr
IGI0OworCWN1cnJlbnQtPmxpbmVzID0gMDsKKworCXEgPSB0ZXh0OworCXAgPSBsaW5lMjsKKwl3
aGlsZSAoKCpwKSA9PSAnICcpCisJICAgIHArKzsKKworCWZvciAoOyAoIWVvbCgqcCkpICYmIChj
dXJyZW50LT5saW5lcyA8IFNVQl9NQVhfVEVYVCk7IHArKykgeworCSAgICBzd2l0Y2ggKCpwKSB7
CisJICAgIGNhc2UgJ3snOgorCQljb21tZW50Kys7CisJCWJyZWFrOworCSAgICBjYXNlICd9JzoK
KwkJY29tbWVudC0tOworCQkvL3RoZSBuZXh0IHRvIGdldCByaWQgb2YgYSBibGFuayBhZnRlciB0
aGUgY29tbWVudAorCQlpZiAoKCoocCArIDEpKSA9PSAnICcpCisJCSAgICBwKys7CisJCWJyZWFr
OworCSAgICBjYXNlICdcXCc6CisJCWlmICgqKHAgKyAxKSA9PSAnbicpIHsKKwkJICAgICpxID0g
J1wwJzsKKwkJICAgIHEgPSB0ZXh0OworCQkgICAgY3VycmVudC0+dGV4dFtjdXJyZW50LT5saW5l
cysrXSA9IHN0cmR1cCh0ZXh0KTsKKwkJICAgIHArKzsKKwkJICAgIGJyZWFrOworCQl9IGVsc2Ug
aWYgKHRvdXBwZXIoKihwICsgMSkpID09ICdDJykgeworCQkgICAgcCsrOworCQkgICAgcCsrOwor
CQkgICAgYnJlYWs7CisJCX0gZWxzZSBpZiAoKHRvdXBwZXIoKihwICsgMSkpID09ICdJJykKKwkJ
CSAgIHx8ICh0b3VwcGVyKCoocCArIDEpKSA9PSAnQicpCisJCQkgICB8fCAodG91cHBlcigqKHAg
KyAxKSkgPT0gJ04nKSkgeworCQkgICAgcCsrOworCQkgICAgYnJlYWs7CisJCX0gZWxzZSBpZiAo
ZW9sKCoocCArIDEpKSkgeworCQkgICAgaWYgKCFmZ2V0cyhsaW5lMSwgTElORV9MRU4sIGZkKSkK
KwkJCXJldHVybiBOVUxMOworCQkgICAgdHJhaWxfc3BhY2UobGluZTEpOworCQkgICAgcCA9IGxp
bmUxOworCQl9CisJICAgIGRlZmF1bHQ6CisJCWlmICghY29tbWVudCkgeworCQkgICAgKnEgPSAq
cDsKKwkJICAgIHErKzsKKwkJfQorCSAgICB9CisJfQorCSpxID0gJ1wwJzsKKwljdXJyZW50LT50
ZXh0W2N1cnJlbnQtPmxpbmVzXSA9IHN0cmR1cCh0ZXh0KTsKKyAgICB9CisgICAgY3VycmVudC0+
bGluZXMrKzsKKyAgICByZXR1cm4gY3VycmVudDsKK30KIAogaW50IHN1Yl9hdXRvZGV0ZWN0IChG
SUxFICpmZCkgewogICAgIGNoYXIgbGluZVtMSU5FX0xFTisxXTsKQEAgLTYyNiw2ICs4MTYsOCBA
QAogCQl7c3ViX3VzZXNfdGltZT0xO3JldHVybiBTVUJfU1VCVklFV0VSMjt9CiAJaWYgKHN0cnN0
ciAobGluZSwgIjxTQU1JPiIpKQogCQl7c3ViX3VzZXNfdGltZT0xOyByZXR1cm4gU1VCX1NBTUk7
fQorCWlmIChzc2NhbmYobGluZSwgIiVkOiVkOiVkLiVkICVkOiVkOiVkLiVkIiwgJmksICZpLCAm
aSwgJmksICZpLCAmaSwgJmksICZpKSA9PSA4KQorCQl7c3ViX3VzZXNfdGltZSA9IDE7IHJldHVy
biBTVUJfSkFDT1NVQjt9CiAJaWYgKHNzY2FuZiAobGluZSwgIiVkOiVkOiVkOiIsICAgICAmaSwg
JmksICZpICk9PTMpCiAJCXtzdWJfdXNlc190aW1lPTE7cmV0dXJuIFNVQl9WUExBWUVSO30KIAlp
ZiAoc3NjYW5mIChsaW5lLCAiJWQ6JWQ6JWQgIiwgICAgICZpLCAmaSwgJmkgKT09MykKQEAgLTc3
Nyw4ICs5NjksOCBAQAogICAgIGludCBuX21heDsKICAgICBzdWJ0aXRsZSAqZmlyc3Q7CiAgICAg
Y2hhciAqZm10bmFtZVtdID0geyAibWljcm9kdmQiLCAic3VicmlwIiwgInN1YnZpZXdlciIsICJz
YW1pIiwgInZwbGF5ZXIiLAotCQkgICAgICAgICJydCIsICJzc2EiLCAiZHVubm93aGF0IiwgIm1w
c3ViIiwgImFxdCIsICJzdWJ2aWV3ZXIgMi4wIiwgInN1YnJpcCAwLjkiIH07Ci0gICAgc3VidGl0
bGUgKiAoKmZ1bmNbXSkoRklMRSAqZmQsc3VidGl0bGUgKmRlc3QpPQorCQkJInJ0IiwgInNzYSIs
ICJkdW5ub3doYXQiLCAibXBzdWIiLCAiYXF0IiwgInN1YnZpZXdlciAyLjAiLCAic3VicmlwIDAu
OSIsICJqYWNvc3ViIiB9OworICAgIHN1YnRpdGxlICogKCpmdW5jW10pKEZJTEUgKmZkLHN1YnRp
dGxlICpkZXN0KT0gCiAgICAgewogCSAgICBzdWJfcmVhZF9saW5lX21pY3JvZHZkLAogCSAgICBz
dWJfcmVhZF9saW5lX3N1YnJpcCwKQEAgLTc5MSw4ICs5ODMsOSBAQAogCSAgICBzdWJfcmVhZF9s
aW5lX21wc3ViLAogCSAgICBzdWJfcmVhZF9saW5lX2FxdCwKIAkgICAgc3ViX3JlYWRfbGluZV9z
dWJ2aWV3ZXIyLAotCSAgICBzdWJfcmVhZF9saW5lX3N1YnJpcDA5Ci0KKwkgICAgc3ViX3JlYWRf
bGluZV9zdWJyaXAwOSwKKwkgICAgc3ViX3JlYWRfbGluZV9qYWNvc3ViCisJICAgIAogICAgIH07
CiAgICAgaWYoZmlsZW5hbWU9PU5VTEwpIHJldHVybiBOVUxMOyAvL3FueCBzZWdmYXVsdAogICAg
IGZkPWZvcGVuIChmaWxlbmFtZSwgInIiKTsgaWYgKCFmZCkgcmV0dXJuIE5VTEw7CkBAIC04ODQs
NyArMTA3Nyw5IEBACiAgICAgIi5zc2EiLAogICAgICIuU1NBIiwKICAgICAiLmFxdCIsCi0gICAg
Ii5BUVQifTsKKyAgICAiLkFRVCIsCisgICAgIi5qcyIsCisgICAgIi5KUyIgfTsKIAogCiAgaWYg
KCBmbmFtZSA9PSBOVUxMICkgcmV0dXJuIE5VTEw7Cg==
-------------- next part --------------
LS0tIHN1YnJlYWRlci5oLm9yaWcJMjAwMi0xMC0yOSAwMToxNjoyMC4wMDAwMDAwMDAgKzAxMDAK
KysrIHN1YnJlYWRlci5oCTIwMDItMTAtMjkgMDA6MzE6MTIuMDAwMDAwMDAwICswMTAwCkBAIC0x
OSw2ICsxOSw3IEBACiAjZGVmaW5lIFNVQl9BUVRJVExFICAgOQogI2RlZmluZSBTVUJfU1VCVklF
V0VSMiAxMAogI2RlZmluZSBTVUJfU1VCUklQMDkgMTEKKyNkZWZpbmUgU1VCX0pBQ09TVUIgIDEy
CiAKIC8vIE9uZSBvZiB0aGUgU1VCXyogY29uc3RhbnQgYWJvdmUKIGV4dGVybiBpbnQgc3ViX2Zv
cm1hdDsK