mpegts: check substreams before discarding

Allow to extract the AC3 core from TrueHD with the "copy" codec. From FFmpeg's 07584ea commit
MythTV · Jul 16, 2013 · c9a51ab · c9a51ab
1 parent c269fdc
commit c9a51ab
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mythtv/external/FFmpeg/libavformat/mpegts-mythtv.c b/mythtv/external/FFmpeg/libavformat/mpegts-mythtv.c
@@ -1001,7 +1001,8 @@ static int mpegts_push_data(MpegTSFilter *filter,
                     code = pes->header[3] | 0x100;
                     av_dlog(pes->stream, "pid=%x pes_code=%#x\n", pes->pid, code);
 
-                    if ((pes->st && pes->st->discard == AVDISCARD_ALL) ||
+                    if ((pes->st && pes->st->discard == AVDISCARD_ALL &&
+                         (!pes->sub_st || pes->sub_st->discard == AVDISCARD_ALL)) ||
                         code == 0x1be) /* padding_stream */
                         goto skip;