# HG changeset patch
# User benoit
# Date 1180947188 0
# Node ID d21480a6890693f735306a2bee922ae1a6331c23
# Parent  f7253362df84a0ffd0607d8573d1abe47b0b18f4
Indentation

diff -r f7253362df84 -r d21480a68906 mpegts.c
--- a/mpegts.c	Sun Jun 03 22:56:11 2007 +0000
+++ b/mpegts.c	Mon Jun 04 08:53:08 2007 +0000
@@ -1213,56 +1213,56 @@
     if (s->iformat == &mpegts_demuxer) {
         /* normal demux */
 
-            /* first do a scaning to get all the services */
+        /* first do a scaning to get all the services */
+        url_fseek(pb, pos, SEEK_SET);
+        mpegts_scan_sdt(ts);
+
+        handle_packets(ts, s->probesize);
+
+        if (ts->nb_services <= 0) {
+            /* no SDT found, we try to look at the PAT */
+
+            /* First remove the SDT filters from each PID */
+            int i;
+            for (i=0; i < NB_PID_MAX; i++) {
+                if (ts->pids[i])
+                    mpegts_close_filter(ts, ts->pids[i]);
+            }
             url_fseek(pb, pos, SEEK_SET);
-            mpegts_scan_sdt(ts);
+            mpegts_scan_pat(ts);
 
             handle_packets(ts, s->probesize);
-
-            if (ts->nb_services <= 0) {
-                /* no SDT found, we try to look at the PAT */
-
-                /* First remove the SDT filters from each PID */
-                int i;
-                for (i=0; i < NB_PID_MAX; i++) {
-                    if (ts->pids[i])
-                        mpegts_close_filter(ts, ts->pids[i]);
-                }
-                url_fseek(pb, pos, SEEK_SET);
-                mpegts_scan_pat(ts);
+        }
 
-                handle_packets(ts, s->probesize);
-            }
+        if (ts->nb_services <= 0) {
+            /* raw transport stream */
+            ts->auto_guess = 1;
+            s->ctx_flags |= AVFMTCTX_NOHEADER;
+            goto do_pcr;
+        }
 
-            if (ts->nb_services <= 0) {
-                /* raw transport stream */
-                ts->auto_guess = 1;
-                s->ctx_flags |= AVFMTCTX_NOHEADER;
-                goto do_pcr;
-            }
-
-            /* tune to first service found */
-            for(i=0; i<ts->nb_services; i++){
-                service = ts->services[i];
-                sid = service->sid;
+        /* tune to first service found */
+        for(i=0; i<ts->nb_services; i++){
+            service = ts->services[i];
+            sid = service->sid;
 #ifdef DEBUG_SI
-                av_log(ts->stream, AV_LOG_DEBUG, "tuning to '%s'\n", service->name);
+            av_log(ts->stream, AV_LOG_DEBUG, "tuning to '%s'\n", service->name);
 #endif
 
-                /* now find the info for the first service if we found any,
-                otherwise try to filter all PATs */
+            /* now find the info for the first service if we found any,
+            otherwise try to filter all PATs */
 
-                url_fseek(pb, pos, SEEK_SET);
-                mpegts_set_service(ts, sid);
+            url_fseek(pb, pos, SEEK_SET);
+            mpegts_set_service(ts, sid);
 
-                handle_packets(ts, s->probesize);
-            }
-            /* if could not find service, enable auto_guess */
+            handle_packets(ts, s->probesize);
+        }
+        /* if could not find service, enable auto_guess */
 
-                ts->auto_guess = 1;
+        ts->auto_guess = 1;
 
 #ifdef DEBUG_SI
-            av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n");
+        av_log(ts->stream, AV_LOG_DEBUG, "tuning done\n");
 #endif
         s->ctx_flags |= AVFMTCTX_NOHEADER;
     } else {