Ticket #6749: fix-wrong-audio-streams.2

--- a/mythtv/libs/libavformat/mpegts.c  2009-07-20 22:51:32.000000000 +0200
+++ b/mythtv/libs/libavformat/mpegts.c  2009-07-21 17:24:07.925849223 +0200
@@ -51,6 +51,7 @@
 static SectionContext *add_section_stream(MpegTSContext *ts, int pid, int stream_type);
 static void mpegts_cleanup_streams(MpegTSContext *ts);
 static int is_desired_stream(int type);
+static int is_audio_stream(int type);
 static int find_in_list(const int *pids, int pid);
 static void mpegts_push_section(void *opaque, const uint8_t *section, int section_len);
 
@@ -1011,6 +1012,25 @@
     return val;
 }
 
+static int is_audio_stream(int stream_type)
+{
+    int val = 0;
+    switch (stream_type)
+    {
+        case STREAM_TYPE_AUDIO_MPEG1:
+        case STREAM_TYPE_AUDIO_MPEG2:
+        case STREAM_TYPE_AUDIO_AAC:
+        case STREAM_TYPE_AUDIO_AC3:
+        case STREAM_TYPE_AUDIO_DTS:
+            val = 1;
+            break;
+        default:
+            /* no audio stream */
+            break;
+    }
+    return val;
+}
+
 static int mpegts_parse_desc(dvb_caption_info_t *dvbci,
                              uint8_t **p, uint8_t *p_end, int *stream_type)
 {
@@ -1173,8 +1193,12 @@
                 return;
             }
 
-            /* Pretend it's audio if we have a language. */
-            st = new_pes_av_stream(pes, prog_reg_desc, item->dvbci.language[0] ? 0x1c0 : 0);
+            int pes_start_code = 0;
+            if (is_audio_stream(item->type))
+            {
+                pes_start_code = 0x1c0;
+            }
+            st = new_pes_av_stream(pes, prog_reg_desc, pes_start_code);
             if (!st)
             {
                 av_log(NULL, AV_LOG_ERROR, "mpegts_add_stream: "