aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpeg.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-11-01 17:50:05 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-11-01 17:50:05 +0000
commit6177c7efe1748f9d89def83c9e792a7fa23526e7 (patch)
tree277b55a74feb0521b6d9a770e734af4592f1c853 /libavformat/mpeg.c
parentad8df79b1d67c247c119a78d31225a7b62cbf188 (diff)
downloadffmpeg-6177c7efe1748f9d89def83c9e792a7fa23526e7.tar.gz
remove useless initialization to 0 of adx context
Originally committed as revision 10899 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpeg.c')
-rw-r--r--libavformat/mpeg.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 0f8270a4fc..b23845f2fc 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -85,15 +85,25 @@ static int mpegps_probe(AVProbeData *p)
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;
}
@@ -427,7 +437,7 @@ static int mpegps_read_packet(AVFormatContext *s,
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;