RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix misdetection of MPEG-PS (AVSEQ03.DAT and AVSEQ06.DAT) as psxstr.

Browse Source 
Originally committed as revision 14167 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-07-11 15:10:58 +00:00
parent 4ad62d9a5c
commit 6e264d45bc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/psxstr.c
View File

@ -67,9 +67,9 @@ static const char sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf
static int str_probe(AVProbeData *p) static int str_probe(AVProbeData *p)
{ {
int start; int start;
uint8_t *sector;
/* need at least 0x38 bytes to validate */ if (p->buf_size < RAW_CD_SECTOR_SIZE)
if (p->buf_size < 0x38)
return 0; return 0;
if ((AV_RL32(&p->buf[0]) == RIFF_TAG) && if ((AV_RL32(&p->buf[0]) == RIFF_TAG) &&
@ -80,10 +80,19 @@ static int str_probe(AVProbeData *p)
} else } else
start = 0; start = 0;
sector= p->buf + start;
/* look for CD sync header (00, 0xFF x 10, 00) */ /* look for CD sync header (00, 0xFF x 10, 00) */
if (memcmp(p->buf+start,sync_header,sizeof(sync_header))) if (memcmp(p->buf+start,sync_header,sizeof(sync_header)))
return 0; return 0;
if(sector[0x11] >= 32)
return 0;
if( (sector[0x12] & CDXA_TYPE_MASK) != CDXA_TYPE_VIDEO
&& (sector[0x12] & CDXA_TYPE_MASK) != CDXA_TYPE_AUDIO
&& (sector[0x12] & CDXA_TYPE_MASK) != CDXA_TYPE_DATA)
return 0;
/* MPEG files (like those ripped from VCDs) can also look like this; /* MPEG files (like those ripped from VCDs) can also look like this;
* only return half certainty */ * only return half certainty */
return 50; return 50;