aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Williams <mike@mikebwilliams.com>2011-07-14 16:49:21 -0400
committerAnton Khirnov <anton@khirnov.net>2011-07-29 08:48:33 +0200
commit298c4e3c522a1bc43cb557efe2e443be2ee80bb5 (patch)
treec581f9784d2898eccec8c90ee2d75ff09997a032
parent8f9d3f6d9a77be68215046fde7a3e0a12fe024f9 (diff)
downloadffmpeg-298c4e3c522a1bc43cb557efe2e443be2ee80bb5.tar.gz
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>
-rw-r--r--libavformat/mpegts.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index b8f02ab8c5..e9b984dc11 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