[MPlayer-cvslog] r36622 - trunk/stream/vcd_read.h

[reimar]

Author: reimar
Date: Sun Jan 19 11:48:02 2014
New Revision: 36622

Log:
vcd_read: Fix sizeof argument.

The struct we need to copy is actually a cdrom_msf0, not cdrom_msf.
Even though the kernel for no good reason reads it in as a
cdrom_msf struct, but only uses the part shared with cdrom_msf0 -
this is probably a kernel bug.

Modified:
   trunk/stream/vcd_read.h

Modified: trunk/stream/vcd_read.h
==============================================================================
--- trunk/stream/vcd_read.h	Sun Jan 19 01:01:21 2014	(r36621)
+++ trunk/stream/vcd_read.h	Sun Jan 19 11:48:02 2014	(r36622)
@@ -152,7 +152,7 @@ static int vcd_end_track(mp_vcd_priv_t* 
 
 static int vcd_read(mp_vcd_priv_t* vcd,char *mem){
 #ifndef sun
-  memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(struct cdrom_msf));
+  memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(vcd->entry.cdte_addr.msf));
   if(ioctl(vcd->fd,CDROMREADRAW,vcd->buf)==-1) return 0; // EOF?
   memcpy(mem,&vcd->buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA);
 #else