# HG changeset patch # User aurel # Date 1194479760 0 # Node ID 1bbb4fa1cdcd82ed13d34e428d947fab71b253ef # Parent 4cfddd2c98a5d6a839a6208112862f8b607c7925 correctly set audio codec when demuxing sofdec files samples: http://samples.mplayerhq.hu/game-formats/sfd/ diff -r 4cfddd2c98a5 -r 1bbb4fa1cdcd mpeg.c --- a/mpeg.c Wed Nov 07 23:01:32 2007 +0000 +++ b/mpeg.c Wed Nov 07 23:56:00 2007 +0000 @@ -107,15 +107,25 @@ typedef struct MpegDemuxContext { int32_t header_state; unsigned char psm_es_type[256]; + int sofdec; } MpegDemuxContext; static int mpegps_read_header(AVFormatContext *s, AVFormatParameters *ap) { MpegDemuxContext *m = s->priv_data; + uint8_t buffer[8192]; + char *p; + m->header_state = 0xff; s->ctx_flags |= AVFMTCTX_NOHEADER; + get_buffer(&s->pb, buffer, sizeof(buffer)); + if ((p=memchr(buffer, 'S', sizeof(buffer)))) + if (!memcmp(p, "Sofdec", 6)) + m->sofdec = 1; + url_fseek(&s->pb, -sizeof(buffer), SEEK_CUR); + /* no need to do more */ return 0; } @@ -449,7 +459,7 @@ type = CODEC_TYPE_VIDEO; } else if (startcode >= 0x1c0 && startcode <= 0x1df) { type = CODEC_TYPE_AUDIO; - codec_id = CODEC_ID_MP2; + codec_id = m->sofdec ? CODEC_ID_ADPCM_ADX : CODEC_ID_MP2; } else if (startcode >= 0x80 && startcode <= 0x87) { type = CODEC_TYPE_AUDIO; codec_id = CODEC_ID_AC3;