Ticket #7804: codec_tag.patch

libs/libavformat/mpegts.c

@@ -29 +29 @@
 #include <pthread.h>
 #include "mpegts.h"
 #include "internal.h"
+#include "riff.h"
 
 /* 1.0 second at 24Mbit/s */
 #define MAX_SCAN_PACKETS 32000
@@ -617 +618 @@
     }
 }
 
+
 static AVStream *new_pes_av_stream(PESContext *pes, uint32_t prog_reg_desc, uint32_t code)
 {
+static const AVCodecTag mpeg_stream_tags[] = {
+        { STREAM_TYPE_VIDEO_MPEG1,              MKTAG('m', 'p', 'g', '1') },
+        { STREAM_TYPE_VIDEO_MPEG2,              MKTAG('m', 'p', 'g', '2') },
+        { STREAM_TYPE_VIDEO_MPEG4,              MKTAG('M', 'P', 'G', '4') },
+        { STREAM_TYPE_VIDEO_H264,               MKTAG('H', '2', '6', '4') },
+        { STREAM_TYPE_VIDEO_VC1,                MKTAG('W', 'V', 'C', '1') },
+        { STREAM_TYPE_VIDEO_DIRAC,              MKTAG('d', 'r', 'a', 'c') },
+        { 0, 0 }
+    };
     AVStream *st = av_new_stream(pes->stream, pes->pid);
+    uint idx;
 
     if (!st)
         return NULL;
@@ -634 +646 @@
     dprintf(pes->stream, "stream_type=%x pid=%x prog_reg_desc=%.4s\n",
             pes->stream_type, pes->pid, (char*)&prog_reg_desc);
 
-    st->codec->codec_tag = pes->stream_type;
+//    st->codec->codec_tag = pes->stream_type;
+    for (idx = 0; mpeg_stream_tags[idx].id && mpeg_stream_tags[idx].id != pes->stream_type; idx++ )
+    {
+    }
+    st->codec->codec_tag = mpeg_stream_tags[idx].tag;
 
     mpegts_find_stream_type(st, pes->stream_type, ISO_types);
     if (prog_reg_desc == AV_RL32("HDMV") &&