diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2007-06-02 21:44:20 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2007-06-02 21:44:20 +0000 |
commit | d287b04b6daab43575111270aace0fab9fdf84df (patch) | |
tree | 83fc36784ddcd66cf25d108ea5338a33a7b4e4f8 /libavformat/mpegts.c | |
parent | 38c48be213b86baa04e64762622afefbba1afa70 (diff) | |
download | ffmpeg-streaming-d287b04b6daab43575111270aace0fab9fdf84df.zip ffmpeg-streaming-d287b04b6daab43575111270aace0fab9fdf84df.tar.gz |
revert r4802 (try with auto_guess if first detection fails)
this change is broken, 3/4 of the code added is unreachable, ill implement
it correctly in a moment
Originally committed as revision 9174 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpegts.c')
-rw-r--r-- | libavformat/mpegts.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 7e09021..be431b1 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1221,7 +1221,6 @@ static int mpegts_read_header(AVFormatContext *s, ts->stream = s; ts->auto_guess = 0; -goto_auto_guess: if (s->iformat == &mpegts_demuxer) { /* normal demux */ @@ -1274,15 +1273,8 @@ goto_auto_guess: } /* if could not find service, exit */ - if (ts->set_service_ret != 0) { - if(ts->auto_guess) - return -1; - else { - //let's retry with auto_guess set - ts->auto_guess = 1; - goto goto_auto_guess; - } - } + if (ts->set_service_ret != 0) + return -1; #ifdef DEBUG_SI av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n"); |