RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge svn changes up to r31104

This commit is contained in:
Uoti Urpala 2010-05-07 21:01:44 +03:00
parent 70a2ded653 3517a9b72b
commit 033e479bec
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvo/x11_common.c
View File

@ -338,9 +338,9 @@ void update_xinerama_info(struct vo *vo) {
struct MPOpts *opts = vo->opts; struct MPOpts *opts = vo->opts;
xinerama_x = xinerama_y = 0; xinerama_x = xinerama_y = 0;
#ifdef CONFIG_XINERAMA #ifdef CONFIG_XINERAMA
int screen = xinerama_screen; if (xinerama_screen >= -1 && XineramaIsActive(vo->x11->display))
if (screen >= -1 && XineramaIsActive(vo->x11->display))
{ {
int screen = xinerama_screen;
XineramaScreenInfo *screens; XineramaScreenInfo *screens;
int num_screens; int num_screens;

13
vobsub.c
View File

@ -285,6 +285,8 @@ typedef struct {
unsigned char *packet; unsigned char *packet;
unsigned int packet_reserve; unsigned int packet_reserve;
unsigned int packet_size; unsigned int packet_size;
int padding_was_here;
int merge;
} mpeg_t; } mpeg_t;
static mpeg_t *mpeg_open(const char *filename) static mpeg_t *mpeg_open(const char *filename)
@ -297,6 +299,8 @@ static mpeg_t *mpeg_open(const char *filename)
res->packet = NULL; res->packet = NULL;
res->packet_size = 0; res->packet_size = 0;
res->packet_reserve = 0; res->packet_reserve = 0;
res->padding_was_here = 1;
res->merge = 0;
res->stream = rar_open(filename, "rb"); res->stream = rar_open(filename, "rb");
err = res->stream == NULL; err = res->stream == NULL;
if (err) if (err)
@ -368,10 +372,13 @@ static int mpeg_run(mpeg_t *mpeg)
return -1; return -1;
} else } else
abort(); abort();
if (!mpeg->padding_was_here)
mpeg->merge = 1;
break; break;
case 0xbd: /* packet */ case 0xbd: /* packet */
if (rar_read(buf, 2, 1, mpeg->stream) != 1) if (rar_read(buf, 2, 1, mpeg->stream) != 1)
return -1; return -1;
mpeg->padding_was_here = 0;
len = buf[0] << 8 | buf[1]; len = buf[0] << 8 | buf[1];
idx = mpeg_tell(mpeg); idx = mpeg_tell(mpeg);
c = rar_getc(mpeg->stream); c = rar_getc(mpeg->stream);
@ -454,6 +461,7 @@ static int mpeg_run(mpeg_t *mpeg)
len = buf[0] << 8 | buf[1]; len = buf[0] << 8 | buf[1];
if (len > 0 && rar_seek(mpeg->stream, len, SEEK_CUR)) if (len > 0 && rar_seek(mpeg->stream, len, SEEK_CUR))
return -1; return -1;
mpeg->padding_was_here = 1;
break; break;
default: default:
if (0xc0 <= buf[3] && buf[3] < 0xf0) { if (0xc0 <= buf[3] && buf[3] < 0xf0) {
@ -1026,6 +1034,11 @@ void *vobsub_open(const char *const name, const char *const ifo,
last_pts_diff = pkt->pts100 - mpg->pts; last_pts_diff = pkt->pts100 - mpg->pts;
else else
pkt->pts100 = mpg->pts; pkt->pts100 = mpg->pts;
if (mpg->merge) {
packet_t *last = &queue->packets[queue->current_index - 1];
pkt->pts100 = last->pts100;
mpg->merge = 0;
}
/* FIXME: should not use mpg_sub internal informations, make a copy */ /* FIXME: should not use mpg_sub internal informations, make a copy */
pkt->data = mpg->packet; pkt->data = mpg->packet;
pkt->size = mpg->packet_size; pkt->size = mpg->packet_size;