projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9deb6d7
)
get rid of if(1)
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 2 Jun 2007 23:14:38 +0000
(23:14 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 2 Jun 2007 23:14:38 +0000
(23:14 +0000)
Originally committed as revision 9179 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/mpegts.c
patch
|
blob
|
history
diff --git
a/libavformat/mpegts.c
b/libavformat/mpegts.c
index
1d47eec
..
02b8d67
100644
(file)
--- 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;