[FFmpeg-cvslog] r14168 - trunk/libavformat/psxstr.c

[michael]

Author: michael
Date: Fri Jul 11 17:12:44 2008
New Revision: 14168

Log:
simplify


Modified:
   trunk/libavformat/psxstr.c

Modified: trunk/libavformat/psxstr.c
==============================================================================
--- trunk/libavformat/psxstr.c	(original)
+++ trunk/libavformat/psxstr.c	Fri Jul 11 17:12:44 2008
@@ -66,8 +66,7 @@ static const char sync_header[12] = {0x0
 
 static int str_probe(AVProbeData *p)
 {
-    int start;
-    uint8_t *sector;
+    uint8_t *sector= p->buf;
 
     if (p->buf_size < RAW_CD_SECTOR_SIZE)
         return 0;
@@ -76,14 +75,11 @@ static int str_probe(AVProbeData *p)
         (AV_RL32(&p->buf[8]) == CDXA_TAG)) {
 
         /* RIFF header seen; skip 0x2C bytes */
-        start = RIFF_HEADER_SIZE;
-    } else
-        start = 0;
-
-    sector= p->buf + start;
+        sector += RIFF_HEADER_SIZE;
+    }
 
     /* look for CD sync header (00, 0xFF x 10, 00) */
-    if (memcmp(p->buf+start,sync_header,sizeof(sync_header)))
+    if (memcmp(sector,sync_header,sizeof(sync_header)))
         return 0;
 
     if(sector[0x11] >= 32)