[FFmpeg-cvslog] mpegts: Put CODEC_ID_NONE check back that was removed by mistake in 5b56ad03

Michael Niedermayer git at videolan.org
Tue Apr 5 00:49:37 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  5 00:06:11 2011 +0200| [3e3ea93b3c5041ef983ae459db8b706b7b708ef1] | committer: Michael Niedermayer

mpegts: Put CODEC_ID_NONE check back that was removed by mistake in 5b56ad03

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e3ea93b3c5041ef983ae459db8b706b7b708ef1
---

 libavformat/mpegts.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 71e8d73..4ce9598 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;



More information about the ffmpeg-cvslog mailing list