diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-23 09:47:18 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-23 09:47:18 +0000 |
| commit | a62815933cce15a1420d6c2f8091a4b95e4d2ad7 (patch) | |
| tree | d8f840432ca533c360da903fb260e32bb9eec2da | |
| parent | 447bd59e69c442c76db743ba1339ed788184a781 (diff) | |
| download | mpv-a62815933cce15a1420d6c2f8091a4b95e4d2ad7.tar.bz2 mpv-a62815933cce15a1420d6c2f8091a4b95e4d2ad7.tar.xz | |
10L bugfix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6157 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | input/joystick.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_ogg.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/input/joystick.c b/input/joystick.c index 6be749e21d..f48f3aab25 100644 --- a/input/joystick.c +++ b/input/joystick.c @@ -46,7 +46,7 @@ int mp_input_joystick_init(char* dev) { while(! inited) { l = 0; while((unsigned int)l < sizeof(struct js_event)) { - int r = read(fd,&ev+l,sizeof(struct js_event)-l); + int r = read(fd,((char*)&ev)+l,sizeof(struct js_event)-l); if(r < 0) { if(errno == EINTR) continue; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 59d467c22e..f6f9abe035 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -534,10 +534,11 @@ int demux_ogg_open(demuxer_t* demuxer) { // if(sh_a->wf) print_wave_header(sh_a->wf); } /// Is it the stream we want - if(demuxer->audio->id == ogg_d->num_sub) + if(demuxer->audio->id == ogg_d->num_sub) { demuxer->audio->sh = sh_a; sh_a->ds = demuxer->audio; ds = demuxer->audio; + } } if(sh_v) { /// Also for video @@ -545,10 +546,11 @@ int demux_ogg_open(demuxer_t* demuxer) { demuxer->video->id = ogg_d->num_sub; // if(sh_v->bih) print_video_header(sh_v->bih); } - if(demuxer->video->id == ogg_d->num_sub) + if(demuxer->video->id == ogg_d->num_sub) { demuxer->video->sh = sh_v; sh_v->ds = demuxer->video; ds = demuxer->video; + } } /// Add the header packets if the stream isn't seekable if(ds && (!s->end_pos || index_mode != 2)) { |