Compare commits

...

3 Commits
v4.8 ... v4.9

Author SHA1 Message Date
Maxim Devaev
030077fb47 Bump version: 4.8 → 4.9 2021-10-30 11:40:31 +03:00
Maxim Devaev
61ddff8b6e Merge pull request #129 from b-rad15/master
Change html links to relative not absolute
2021-10-30 11:27:20 +03:00
Bradley O'Connell
27fbfe149e changed html links to relative not absolute 2021-10-30 03:20:57 -04:00
9 changed files with 23 additions and 23 deletions

View File

@@ -1,7 +1,7 @@
[bumpversion] [bumpversion]
commit = True commit = True
tag = True tag = True
current_version = 4.8 current_version = 4.9
parse = (?P<major>\d+)\.(?P<minor>\d+) parse = (?P<major>\d+)\.(?P<minor>\d+)
serialize = serialize =
{major}.{minor} {major}.{minor}

View File

@@ -1,6 +1,6 @@
.\" Manpage for ustreamer-dump. .\" Manpage for ustreamer-dump.
.\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos .\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
.TH USTREAMER-DUMP 1 "version 4.8" "January 2021" .TH USTREAMER-DUMP 1 "version 4.9" "January 2021"
.SH NAME .SH NAME
ustreamer-dump \- Dump uStreamer's memory sink to file ustreamer-dump \- Dump uStreamer's memory sink to file

View File

@@ -1,6 +1,6 @@
.\" Manpage for ustreamer. .\" Manpage for ustreamer.
.\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos .\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
.TH USTREAMER 1 "version 4.8" "November 2020" .TH USTREAMER 1 "version 4.9" "November 2020"
.SH NAME .SH NAME
ustreamer \- stream MJPG video from any V4L2 device to the network ustreamer \- stream MJPG video from any V4L2 device to the network

View File

@@ -3,7 +3,7 @@
pkgname=ustreamer pkgname=ustreamer
pkgver=4.8 pkgver=4.9
pkgrel=1 pkgrel=1
pkgdesc="Lightweight and fast MJPG-HTTP streamer" pkgdesc="Lightweight and fast MJPG-HTTP streamer"
url="https://github.com/pikvm/ustreamer" url="https://github.com/pikvm/ustreamer"

View File

@@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ustreamer PKG_NAME:=ustreamer
PKG_VERSION:=4.8 PKG_VERSION:=4.9
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com> PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>

View File

@@ -8,7 +8,7 @@ from distutils.core import setup
if __name__ == "__main__": if __name__ == "__main__":
setup( setup(
name="ustreamer", name="ustreamer",
version="4.8", version="4.9",
description="uStreamer tools", description="uStreamer tools",
author="Maxim Devaev", author="Maxim Devaev",
author_email="mdevaev@gmail.com", author_email="mdevaev@gmail.com",

View File

@@ -23,7 +23,7 @@
#pragma once #pragma once
#define VERSION_MAJOR 4 #define VERSION_MAJOR 4
#define VERSION_MINOR 8 #define VERSION_MINOR 9
#define MAKE_VERSION2(_major, _minor) #_major "." #_minor #define MAKE_VERSION2(_major, _minor) #_major "." #_minor
#define MAKE_VERSION1(_major, _minor) MAKE_VERSION2(_major, _minor) #define MAKE_VERSION1(_major, _minor) MAKE_VERSION2(_major, _minor)

View File

@@ -12,30 +12,30 @@
<hr> <hr>
<ul> <ul>
<li> <li>
<a href="/state"><b>/state</b></a><br> <a href="state"><b>/state</b></a><br>
Get JSON structure with the state of the server. Get JSON structure with the state of the server.
</li> </li>
<br> <br>
<li> <li>
<a href="/snapshot"><b>/snapshot</b></a><br> <a href="snapshot"><b>/snapshot</b></a><br>
Get a current actual image from the server. Get a current actual image from the server.
</li> </li>
<br> <br>
<li> <li>
<a href="/stream"><b>/stream</b></a><br> <a href="stream"><b>/stream</b></a><br>
Get a live stream. Query params:<br> Get a live stream. Query params:<br>
<br> <br>
<ul> <ul>
<li> <li>
<b>key=abc123</b><br> <b>key=abc123</b><br>
The user-defined key, which is part of cookie <i>stream_client</i>, which allows<br> The user-defined key, which is part of cookie <i>stream_client</i>, which allows<br>
the stream client to determine its identifier and view statistics using <a href="/state">/state</a>. the stream client to determine its identifier and view statistics using <a href="state">/state</a>.
</li> </li>
<br> <br>
<li> <li>
<b>extra_headers=1</b><br> <b>extra_headers=1</b><br>
Add <i>X-UStreamer-*</i> headers to the <a href="/stream">/stream</a> handle Add <i>X-UStreamer-*</i> headers to the <a href="stream">/stream</a> handle
(like with the <a href="/snapshot">/snapshot</a>). (like with the <a href="snapshot">/snapshot</a>).
</li> </li>
<br> <br>
<li> <li>
@@ -62,9 +62,9 @@
The mjpg-streamer compatibility layer:<br> The mjpg-streamer compatibility layer:<br>
<br> <br>
<ul> <ul>
<li><a href="/?action=snapshot">/?action=snapshot</a> as alias to the <a href="/snapshot">/snapshot</a>.</li> <li><a href="?action=snapshot">/?action=snapshot</a> as alias to the <a href="snapshot">/snapshot</a>.</li>
<br> <br>
<li><a href="/?action=stream">/?action=stream</a> as alias to the <a href="/stream">/stream</a>.</li> <li><a href="?action=stream">/?action=stream</a> as alias to the <a href="stream">/stream</a>.</li>
</ul> </ul>
</li> </li>
</ul> </ul>

View File

@@ -37,30 +37,30 @@ const char *const HTML_INDEX_PAGE = " \
<hr> \ <hr> \
<ul> \ <ul> \
<li> \ <li> \
<a href=\"/state\"><b>/state</b></a><br> \ <a href=\"state\"><b>/state</b></a><br> \
Get JSON structure with the state of the server. \ Get JSON structure with the state of the server. \
</li> \ </li> \
<br> \ <br> \
<li> \ <li> \
<a href=\"/snapshot\"><b>/snapshot</b></a><br> \ <a href=\"snapshot\"><b>/snapshot</b></a><br> \
Get a current actual image from the server. \ Get a current actual image from the server. \
</li> \ </li> \
<br> \ <br> \
<li> \ <li> \
<a href=\"/stream\"><b>/stream</b></a><br> \ <a href=\"stream\"><b>/stream</b></a><br> \
Get a live stream. Query params:<br> \ Get a live stream. Query params:<br> \
<br> \ <br> \
<ul> \ <ul> \
<li> \ <li> \
<b>key=abc123</b><br> \ <b>key=abc123</b><br> \
The user-defined key, which is part of cookie <i>stream_client</i>, which allows<br> \ The user-defined key, which is part of cookie <i>stream_client</i>, which allows<br> \
the stream client to determine its identifier and view statistics using <a href=\"/state\">/state</a>. \ the stream client to determine its identifier and view statistics using <a href=\"state\">/state</a>. \
</li> \ </li> \
<br> \ <br> \
<li> \ <li> \
<b>extra_headers=1</b><br> \ <b>extra_headers=1</b><br> \
Add <i>X-UStreamer-*</i> headers to the <a href=\"/stream\">/stream</a> handle \ Add <i>X-UStreamer-*</i> headers to the <a href=\"stream\">/stream</a> handle \
(like with the <a href=\"/snapshot\">/snapshot</a>). \ (like with the <a href=\"snapshot\">/snapshot</a>). \
</li> \ </li> \
<br> \ <br> \
<li> \ <li> \
@@ -87,9 +87,9 @@ const char *const HTML_INDEX_PAGE = " \
The mjpg-streamer compatibility layer:<br> \ The mjpg-streamer compatibility layer:<br> \
<br> \ <br> \
<ul> \ <ul> \
<li><a href=\"/?action=snapshot\">/?action=snapshot</a> as alias to the <a href=\"/snapshot\">/snapshot</a>.</li> \ <li><a href=\"?action=snapshot\">/?action=snapshot</a> as alias to the <a href=\"snapshot\">/snapshot</a>.</li> \
<br> \ <br> \
<li><a href=\"/?action=stream\">/?action=stream</a> as alias to the <a href=\"/stream\">/stream</a>.</li> \ <li><a href=\"?action=stream\">/?action=stream</a> as alias to the <a href=\"stream\">/stream</a>.</li> \
</ul> \ </ul> \
</li> \ </li> \
</ul> \ </ul> \