Browse Source

simplify

Originally committed as revision 14168 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 17 years ago
parent
commit
876ef93d99
1 changed files with 4 additions and 8 deletions
  1. +4
    -8
      libavformat/psxstr.c

+ 4
- 8
libavformat/psxstr.c View File

@@ -66,8 +66,7 @@ static const char sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf

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)


Loading…
Cancel
Save