virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Revert r6124, the change was just wrong, other formats than MPEG-PS can be

Browse Source 
stored in CDXA as well. And the need for a CDXA specific check is questionable.
Also ive ok-ed that patch instead of mans ...
fixes issue287 (psxstr misdetection as MPEG-PS)

Original commit message:
add support for information in CDXA format
patch by Allan Sandfeld Jensen % kde A carewolf P com %
Original thread:
Date: Aug 18, 2006 6:33 PM
Subject: [Ffmpeg-devel] CDXA in libavformat [patch]

Originally committed as revision 11314 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Allan Sandfeld Jensen 2007-12-25 09:37:49 +00:00 committed by Michael Niedermayer
parent 4f365f37b5
commit 7dc75e8d43
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/mpeg.c
View File

@ -32,18 +32,6 @@
#define MAX_SYNC_SIZE 100000 #define MAX_SYNC_SIZE 100000
static int cdxa_probe(AVProbeData *p)
{
/* check file header */
if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
p->buf[2] == 'F' && p->buf[3] == 'F' &&
p->buf[8] == 'C' && p->buf[9] == 'D' &&
p->buf[10] == 'X' && p->buf[11] == 'A')
return AVPROBE_SCORE_MAX;
else
return 0;
}
static int check_pes(uint8_t *p, uint8_t *end){ static int check_pes(uint8_t *p, uint8_t *end){
int pes1; int pes1;
int pes2= (p[3] & 0xC0) == 0x80 int pes2= (p[3] & 0xC0) == 0x80
@ -71,10 +59,6 @@ static int mpegps_probe(AVProbeData *p)
int i; int i;
int score=0; int score=0;
score = cdxa_probe(p);
if (score > 0) return score;
/* Search for MPEG stream */
for(i=0; i<p->buf_size; i++){ for(i=0; i<p->buf_size; i++){
code = (code<<8) + p->buf[i]; code = (code<<8) + p->buf[i];
if ((code & 0xffffff00) == 0x100) { if ((code & 0xffffff00) == 0x100) {