add raw demuxer for Chinese AVS elementary streams

[ffmpeg] / libavformat / mp3.c

diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index ba3baf14231da7b1521f37c5b5dffbaa2eebd0b7..a887c3da8da1a0cdc0c7201460f783f9f2fcdde2 100644 (file)
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -170,16 +170,14 @@ static unsigned int id3v2_get_size(ByteIOContext *s, int len)
 static void id3v2_read_ttag(AVFormatContext *s, int taglen, const char *key)
 {
     char *q, dst[512];
-    int len, dstlen = sizeof(dst);
+    int len, dstlen = sizeof(dst) - 1;
     unsigned genre;
 
-    if(dstlen > 0)
-        dst[0]= 0;
+    dst[0]= 0;
     if(taglen < 1)
         return;
 
     taglen--; /* account for encoding type byte */
-    dstlen--; /* Leave space for zero terminator */
 
     switch(get_byte(s->pb)) { /* encoding type */
 
@@ -393,6 +391,7 @@ static int mp3_read_probe(AVProbeData *p)
     if   (first_frames>=3) return AVPROBE_SCORE_MAX/2+1;
     else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
     else if(max_frames>=3) return AVPROBE_SCORE_MAX/4;
+    else if(buf0!=p->buf)  return AVPROBE_SCORE_MAX/4-1;
     else if(max_frames>=1) return 1;
     else                   return 0;
 }