[FFmpeg-cvslog] mpegts: remove invalid error check

Mike Williams git at videolan.org
Sat Jul 30 06:55:33 CEST 2011


ffmpeg | branch: master | Mike Williams <mike at mikebwilliams.com> | Thu Jul 14 16:49:21 2011 -0400| [298c4e3c522a1bc43cb557efe2e443be2ee80bb5] | committer: Anton Khirnov

mpegts: remove invalid error check

mpegts_read_header is used by both mpegts and mpegtsraw, so this
erro check is no longer valid.

Signed-off-by: Mike Williams <mike at mikebwilliams.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

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

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index b8f02ab..e9b984d 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1470,10 +1470,6 @@ static int mpegts_read_header(AVFormatContext *s,
     if (ap) {
         if (ap->mpeg2ts_compute_pcr)
             ts->mpeg2ts_compute_pcr = ap->mpeg2ts_compute_pcr;
-        if(ap->mpeg2ts_raw){
-            av_log(s, AV_LOG_ERROR, "use mpegtsraw_demuxer!\n");
-            return -1;
-        }
     }
 #endif
 



More information about the ffmpeg-cvslog mailing list