From 298c4e3c522a1bc43cb557efe2e443be2ee80bb5 Mon Sep 17 00:00:00 2001
From: Mike Williams <mike@mikebwilliams.com>
Date: Thu, 14 Jul 2011 16:49:21 -0400
Subject: [PATCH] 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@mikebwilliams.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
libavformat/mpegts.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index b8f02ab8c5d..e9b984dc117 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
--
GitLab