[FFmpeg-cvslog] r10899 - in trunk: libavcodec/adx.c libavformat/mpeg.c

[aurel]

Author: aurel
Date: Thu Nov  1 18:50:05 2007
New Revision: 10899

Log:
remove useless initialization to 0 of adx context

Modified:
   trunk/libavcodec/adx.c
   trunk/libavformat/mpeg.c

Modified: trunk/libavcodec/adx.c
==============================================================================
--- trunk/libavcodec/adx.c	(original)
+++ trunk/libavcodec/adx.c	Thu Nov  1 18:50:05 2007
@@ -176,7 +176,6 @@ static int adx_encode_header(AVCodecCont
     return 0x20+4;
 }
 
-static int adx_decode_init(AVCodecContext *avctx);
 static int adx_encode_init(AVCodecContext *avctx)
 {
     if (avctx->channels > 2)
@@ -189,7 +188,6 @@ static int adx_encode_init(AVCodecContex
 //    avctx->bit_rate = avctx->sample_rate*avctx->channels*18*8/32;
 
     av_log(avctx, AV_LOG_DEBUG, "adx encode init\n");
-    adx_decode_init(avctx);
 
     return 0;
 }
@@ -284,20 +282,6 @@ static int adx_decode_header(AVCodecCont
     return offset;
 }
 
-static int adx_decode_init(AVCodecContext * avctx)
-{
-    ADXContext *c = avctx->priv_data;
-
-//    printf("adx_decode_init\n"); fflush(stdout);
-    c->prev[0].s1 = 0;
-    c->prev[0].s2 = 0;
-    c->prev[1].s1 = 0;
-    c->prev[1].s2 = 0;
-    c->header_parsed = 0;
-    c->in_temp = 0;
-    return 0;
-}
-
 #if 0
 static void dump(unsigned char *buf,size_t len)
 {
@@ -391,7 +375,7 @@ AVCodec adpcm_adx_decoder = {
     CODEC_TYPE_AUDIO,
     CODEC_ID_ADPCM_ADX,
     sizeof(ADXContext),
-    adx_decode_init,
+    NULL,
     NULL,
     NULL,
     adx_decode_frame,

Modified: trunk/libavformat/mpeg.c
==============================================================================
--- trunk/libavformat/mpeg.c	(original)
+++ trunk/libavformat/mpeg.c	Thu Nov  1 18:50:05 2007
@@ -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(AVFormatCo
         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;