Mercurial > libavformat.hg

changeset 2109:b5f2710d2dd0 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author michael
date Sat, 02 Jun 2007 21:44:20 +0000
parents 31619b03d1ce
children 495161f79093
files mpegts.c
diffstat 1 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mpegts.c	Sat Jun 02 20:57:31 2007 +0000
+++ b/mpegts.c	Sat Jun 02 21:44:20 2007 +0000
@@ -1221,7 +1221,6 @@
     ts->stream = s;
     ts->auto_guess = 0;
 
-goto_auto_guess:
     if (s->iformat == &mpegts_demuxer) {
         /* normal demux */
 
@@ -1274,15 +1273,8 @@
             }
             /* 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");