lavf/matroskadec: drop indexes that appear broken

[ffmpeg] / ffserver.c
diff --git a/ffserver.c b/ffserver.c

index 032ce227da26475b7adcebfb879cc390ddd873d8..1d4c8dc5b98453f2cc158ac73e3077e804195efc 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -287,10 +287,14 @@ static int ffm_write_write_index(int fd, int64_t pos)
      for(i=0;i<8;i++)
          buf[i] = (pos >> (56 - i * 8)) & 0xff;
      if (lseek(fd, 8, SEEK_SET) < 0)
-        return AVERROR(EIO);
+        goto bail_eio;
      if (write(fd, buf, 8) != 8)
-        return AVERROR(EIO);
+        goto bail_eio;
+
      return 8;
+
+bail_eio:
+    return AVERROR(EIO);
  }
  
  static void ffm_set_write_index(AVFormatContext *s, int64_t pos,
@@ -467,6 +471,7 @@ static void start_children(FFServerStream *feed)
          av_free (pathname);
          _exit(1);
      }
+    av_free (pathname);
  }
  
  /* open a listening socket */
@@ -737,8 +742,10 @@ static void http_send_too_busy_reply(int fd)
                         "Content-type: text/html\r\n"
                         "\r\n"
                         "<html><head><title>Too busy</title></head><body>\r\n"
-                       "<p>The server is too busy to serve your request at this time.</p>\r\n"
-                       "<p>The number of current connections is %u, and this exceeds the limit of %u.</p>\r\n"
+                       "<p>The server is too busy to serve your request at "
+                       "this time.</p>\r\n"
+                       "<p>The number of current connections is %u, and this "
+                       "exceeds the limit of %u.</p>\r\n"
                         "</body></html>\r\n",
                         nb_connections, config.nb_max_connections);
      av_assert0(len < sizeof(buffer));
@@ -1482,9 +1489,11 @@ static int http_parse_request(HTTPContext *c)
                        "Content-type: text/html\r\n"
                        "\r\n"
                        "<html><head><title>Too busy</title></head><body>\r\n"
-                      "<p>The server is too busy to serve your request at this time.</p>\r\n"
-                      "<p>The bandwidth being served (including your stream) is %"PRIu64"kbit/sec, "
-                      "and this exceeds the limit of %"PRIu64"kbit/sec.</p>\r\n"
+                      "<p>The server is too busy to serve your request at "
+                      "this time.</p>\r\n"
+                      "<p>The bandwidth being served (including your stream) "
+                      "is %"PRIu64"kbit/s, and this exceeds the limit of "
+                      "%"PRIu64"kbit/s.</p>\r\n"
                        "</body></html>\r\n",
                   current_bandwidth, config.max_bandwidth);
          q += strlen(q);
@@ -1781,7 +1790,7 @@ static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream)
      stream_no = stream->nb_streams;
  
      avio_printf(pb, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>"
-                    "type<th>kbits/s<th align=left>codec<th align=left>"
+                    "type<th>kbit/s<th align=left>codec<th align=left>"
                      "Parameters\n");
  
      for (i = 0; i < stream_no; i++) {
@@ -1846,7 +1855,7 @@ static void compute_status(HTTPContext *c)
      /* format status */
      avio_printf(pb, "<h2>Available Streams</h2>\n");
      avio_printf(pb, "<table cellspacing=0 cellpadding=4>\n");
-    avio_printf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbits/s<th align=left>Video<br>kbits/s<th><br>Codec<th align=left>Audio<br>kbits/s<th><br>Codec<th align=left valign=top>Feed\n");
+    avio_printf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbit/s<th align=left>Video<br>kbit/s<th><br>Codec<th align=left>Audio<br>kbit/s<th><br>Codec<th align=left valign=top>Feed\n");
      stream = config.first_stream;
      while (stream) {
          char sfilename[1024];
@@ -2001,7 +2010,7 @@ static void compute_status(HTTPContext *c)
  
      avio_printf(pb, "<table>\n");
      avio_printf(pb, "<tr><th>#<th>File<th>IP<th>Proto<th>State<th>Target "
-                    "bits/sec<th>Actual bits/sec<th>Bytes transferred\n");
+                    "bit/s<th>Actual bit/s<th>Bytes transferred\n");
      c1 = first_http_ctx;
      i = 0;
      while (c1) {