Mercurial > mplayer.hg

changeset 36526:e0d75c4ad96b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Sun, 19 Jan 2014 10:48:02 +0000
parents 8303442b7870
children 6d2f5a28c064
files stream/vcd_read.h
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/stream/vcd_read.h	Sun Jan 19 00:01:21 2014 +0000
+++ b/stream/vcd_read.h	Sun Jan 19 10:48:02 2014 +0000
@@ -152,7 +152,7 @@
 
 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