Mercurial > libavformat.hg
changeset 2858:2d7817482abc libavformat
Revert r6124, the change was just wrong, other formats than MPEG-PS can be
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]
| author | michael |
|---|---|
| date | Tue, 25 Dec 2007 09:37:49 +0000 |
| parents | 02256c92627d |
| children | 8490c561d921 |
| files | mpeg.c |
| diffstat | 1 files changed, 0 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/mpeg.c Mon Dec 24 12:49:27 2007 +0000 +++ b/mpeg.c Tue Dec 25 09:37:49 2007 +0000 @@ -32,18 +32,6 @@ #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){ int pes1; int pes2= (p[3] & 0xC0) == 0x80 @@ -71,10 +59,6 @@ int i; int score=0; - score = cdxa_probe(p); - if (score > 0) return score; - - /* Search for MPEG stream */ for(i=0; i<p->buf_size; i++){ code = (code<<8) + p->buf[i]; if ((code & 0xffffff00) == 0x100) {