summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-05 00:06:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-05 00:48:52 +0200
commit3e3ea93b3c5041ef983ae459db8b706b7b708ef1 (patch)
tree071f4b234f28adbead53d4f6131c43b180b7e60b /libavformat
parent02fd687bbe15b6a3859532898c5d90bc7fa181d6 (diff)
mpegts: Put CODEC_ID_NONE check back that was removed by mistake in 5b56ad03
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpegts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 71e8d7318f..4ce9598e15 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -704,7 +704,7 @@ static int mpegts_push_data(MpegTSFilter *filter,
code != 0x1ff && code != 0x1f2 && /* program_stream_directory, DSMCC_stream */
code != 0x1f8) { /* ITU-T Rec. H.222.1 type E stream */
pes->state = MPEGTS_PESHEADER;
- if (!pes->st->request_probe) {
+ if (pes->st->codec->codec_id == CODEC_ID_NONE && !pes->st->request_probe) {
av_dlog(pes->stream, "pid=%x stream_type=%x probing\n",
pes->pid, pes->stream_type);
pes->st->request_probe= 1;