RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-30 15:29:56 +00:00
Code Issues Releases Wiki Activity

10l, lot of missing new-lines. In case of an error, all the messages will be screwed up

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10759 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-08-31 22:36:27 +00:00
parent 908e6a761d
commit 078776801b
1 changed files with 8 additions and 8 deletions

16
vobsub.c
View File

@ -327,7 +327,7 @@ mpeg_run(mpeg_t *mpeg)
else if ((c & 0xf0) == 0x20) else if ((c & 0xf0) == 0x20)
version = 2; version = 2;
else { else {
mp_msg(MSGT_VOBSUB,MSGL_ERR, "Unsupported MPEG version: 0x%02x", c); mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Unsupported MPEG version: 0x%02x\n", c);
return -1; return -1;
} }
if (version == 4) { if (version == 4) {
@ -940,16 +940,16 @@ vobsub_parse_ifo(void* this, const char *const name, unsigned int *palette, unsi
rar_stream_t *fd = rar_open(name, "rb"); rar_stream_t *fd = rar_open(name, "rb");
if (fd == NULL) { if (fd == NULL) {
if (force) if (force)
mp_msg(MSGT_VOBSUB,MSGL_ERR, "Can't open IFO file"); mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Can't open IFO file\n");
} else { } else {
// parse IFO header // parse IFO header
unsigned char block[0x800]; unsigned char block[0x800];
const char *const ifo_magic = "DVDVIDEO-VTS"; const char *const ifo_magic = "DVDVIDEO-VTS";
if (rar_read(block, sizeof(block), 1, fd) != 1) { if (rar_read(block, sizeof(block), 1, fd) != 1) {
if (force) if (force)
mp_msg(MSGT_VOBSUB,MSGL_ERR, "Can't read IFO header"); mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Can't read IFO header\n");
} else if (memcmp(block, ifo_magic, strlen(ifo_magic) + 1)) } else if (memcmp(block, ifo_magic, strlen(ifo_magic) + 1))
mp_msg(MSGT_VOBSUB,MSGL_ERR, "Bad magic in IFO header\n"); mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Bad magic in IFO header\n");
else { else {
unsigned long pgci_sector = block[0xcc] << 24 | block[0xcd] << 16 unsigned long pgci_sector = block[0xcc] << 24 | block[0xcd] << 16
| block[0xce] << 8 | block[0xcf]; | block[0xce] << 8 | block[0xcf];
@ -982,7 +982,7 @@ vobsub_parse_ifo(void* this, const char *const name, unsigned int *palette, unsi
} }
if (rar_seek(fd, pgci_sector * sizeof(block), SEEK_SET) if (rar_seek(fd, pgci_sector * sizeof(block), SEEK_SET)
|| rar_read(block, sizeof(block), 1, fd) != 1) || rar_read(block, sizeof(block), 1, fd) != 1)
mp_msg(MSGT_VOBSUB,MSGL_ERR, "Can't read IFO PGCI"); mp_msg(MSGT_VOBSUB,MSGL_ERR, "VobSub: Can't read IFO PGCI\n");
else { else {
unsigned long idx; unsigned long idx;
unsigned long pgc_offset = block[0xc] << 24 | block[0xd] << 16 unsigned long pgc_offset = block[0xc] << 24 | block[0xd] << 16
@ -1034,7 +1034,7 @@ vobsub_open(const char *const name,const char *const ifo,const int force,void**
fd = rar_open(buf, "rb"); fd = rar_open(buf, "rb");
if (fd == NULL) { if (fd == NULL) {
if(force) if(force)
mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: Can't open IDX file"); mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: Can't open IDX file\n");
else { else {
free(buf); free(buf);
free(vob); free(vob);
@ -1057,7 +1057,7 @@ vobsub_open(const char *const name,const char *const ifo,const int force,void**
mpg = mpeg_open(buf); mpg = mpeg_open(buf);
if (mpg == NULL) { if (mpg == NULL) {
if(force) if(force)
mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: Can't open SUB file"); mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: Can't open SUB file\n");
else { else {
free(buf); free(buf);
@ -1070,7 +1070,7 @@ vobsub_open(const char *const name,const char *const ifo,const int force,void**
off_t pos = mpeg_tell(mpg); off_t pos = mpeg_tell(mpg);
if (mpeg_run(mpg) < 0) { if (mpeg_run(mpg) < 0) {
if (!mpeg_eof(mpg)) if (!mpeg_eof(mpg))
mp_msg(MSGT_VOBSUB,MSGL_ERR,"mpeg_run error"); mp_msg(MSGT_VOBSUB,MSGL_ERR,"VobSub: mpeg_run error\n");
break; break;
} }
if (mpg->packet_size) { if (mpg->packet_size) {