summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-06-02 23:14:38 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-06-02 23:14:38 +0000
commitb91811af83130b0ef001b01f0919c6ffd92b3479 (patch)
tree0cf2628490c32b63b93b7810a8ac82f7909878ee /libavformat
parent9deb6d71b8bd2fb2f853aa7f709bba27a2311c66 (diff)
get rid of if(1)
Originally committed as revision 9179 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mpegts.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 1d47eec45a..02b8d677b2 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1213,7 +1213,6 @@ static int mpegts_read_header(AVFormatContext *s,
if (s->iformat == &mpegts_demuxer) {
/* normal demux */
- if (!ts->auto_guess) {
/* first do a scaning to get all the services */
url_fseek(pb, pos, SEEK_SET);
mpegts_scan_sdt(ts);
@@ -1265,7 +1264,6 @@ static int mpegts_read_header(AVFormatContext *s,
#ifdef DEBUG_SI
av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n");
#endif
- }
s->ctx_flags |= AVFMTCTX_NOHEADER;
} else {
AVStream *st;