diff options
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 10 | ||||
| -rw-r--r-- | src/input/input_dvd.c | 3 | ||||
| -rw-r--r-- | src/input/input_vcd.c | 23 |
3 files changed, 21 insertions, 15 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 2abc7119d..25ac692bb 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.9 2001/05/30 02:09:24 f1rmb Exp $ + * $Id: demux_mpeg_block.c,v 1.10 2001/05/30 21:48:23 f1rmb Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -431,17 +431,17 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen, switch(buf[3]) { case 0xba: - if((buf[4] & 0xc0) == 0x40) + if((buf[4] & 0xc0) == 0x40) { this->input = input; return DEMUX_CAN_HANDLE; - + } break; case 0xe0: - if((buf[6] & 0xc0) == 0x80) + if((buf[6] & 0xc0) == 0x80) { this->input = input; return DEMUX_CAN_HANDLE; - + } break; } diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 2f6ebc0c6..2d5826fc4 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.7 2001/05/30 02:09:24 f1rmb Exp $ + * $Id: input_dvd.c,v 1.8 2001/05/30 21:48:23 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -491,6 +491,7 @@ static char **dvd_plugin_get_autoplay_list (input_plugin_t *this_gen, *nFiles = nFiles2; + this->filelist2[*nFiles] = NULL; close (fd); } else { diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index ebf3e0d14..4ed93ffdf 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_vcd.c,v 1.6 2001/05/11 17:15:45 f1rmb Exp $ + * $Id: input_vcd.c,v 1.7 2001/05/30 21:48:23 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -378,7 +378,8 @@ static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, } while((data.subheader[2]&~0x01)==0x60); - memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */ + buf->content = buf->mem; + memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */ return buf; } #elif defined (__FreeBSD__) @@ -404,7 +405,9 @@ static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, } this->cur_sector++; } while ((data.subheader[2]&~0x01)==0x60); - memcpy (buf, data.data, VCDSECTORSIZE); + + buf->content = buf->mem; + memcpy (buf->mem, data.data, VCDSECTORSIZE); return buf; } #endif @@ -416,12 +419,12 @@ static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, */ #if defined (__linux__) static off_t vcd_plugin_seek (input_plugin_t *this_gen, - off_t offset, int origin) { + off_t offset, int origin) { - vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; - struct cdrom_msf0 *start_msf; - uint32_t dist ; - off_t sector_pos; + vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; + struct cdrom_msf0 *start_msf; + uint32_t dist ; + off_t sector_pos; start_msf = &this->tocent[this->cur_track].cdte_addr.msf; @@ -569,7 +572,7 @@ static off_t vcd_plugin_get_current_pos (input_plugin_t *this_gen){ * */ static uint32_t vcd_plugin_get_capabilities (input_plugin_t *this_gen) { - + return INPUT_CAP_SEEKABLE | INPUT_CAP_BLOCK | INPUT_CAP_AUTOPLAY | INPUT_CAP_GET_DIR; } @@ -752,6 +755,8 @@ static char **vcd_plugin_get_autoplay_list (input_plugin_t *this_gen, /* printf ("list[%d] : %d %s\n", i, this->filelist[i-1], this->filelist[i-1]); */ } + this->filelist[i-1] = NULL; + return this->filelist; } |