Compare commits

...

2 Commits
v1.14 ... v1.15

Author SHA1 Message Date
Devaev Maxim
6c2353ce2c Bump version: 1.14 → 1.15 2020-05-03 06:38:11 +03:00
Devaev Maxim
fcdfb2930a refactoring 2020-05-03 06:38:02 +03:00
6 changed files with 10 additions and 10 deletions

View File

@@ -1,7 +1,7 @@
[bumpversion] [bumpversion]
commit = True commit = True
tag = True tag = True
current_version = 1.14 current_version = 1.15
parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)? parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
serialize = serialize =
{major}.{minor} {major}.{minor}

View File

@@ -3,7 +3,7 @@
pkgname=ustreamer pkgname=ustreamer
pkgver=1.14 pkgver=1.15
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:=1.14 PKG_VERSION:=1.15
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com> PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>

View File

@@ -23,5 +23,5 @@
#pragma once #pragma once
#ifndef VERSION #ifndef VERSION
# define VERSION "1.14" # define VERSION "1.15"
#endif #endif

View File

@@ -35,9 +35,9 @@
case _value: { return #_value; } case _value: { return #_value; }
#define CASE_ASSERT(_msg, _value) default: { \ #define CASE_ASSERT(_msg, _value) default: { \
char *_buf; A_CALLOC(_buf, 128); \ char *_assert_buf; A_CALLOC(_assert_buf, 128); \
sprintf(_buf, _msg ": 0x%08x", _value); \ sprintf(_assert_buf, _msg ": 0x%08x", _value); \
assert(0 && _buf); \ assert(0 && _assert_buf); \
} }
const char *omx_error_to_string(OMX_ERRORTYPE error) { const char *omx_error_to_string(OMX_ERRORTYPE error) {

View File

@@ -51,9 +51,9 @@
#ifdef WITH_PTHREAD_NP #ifdef WITH_PTHREAD_NP
# define A_THREAD_RENAME(_fmt, ...) { \ # define A_THREAD_RENAME(_fmt, ...) { \
char _buf[MAX_THREAD_NAME] = {0}; \ char _new_tname_buf[MAX_THREAD_NAME] = {0}; \
assert(snprintf(_buf, MAX_THREAD_NAME, _fmt, ##__VA_ARGS__) > 0); \ assert(snprintf(_new_tname_buf, MAX_THREAD_NAME, _fmt, ##__VA_ARGS__) > 0); \
thread_set_name(_buf); \ thread_set_name(_new_tname_buf); \
} }
#else #else
# define A_THREAD_RENAME(_fmt, ...) # define A_THREAD_RENAME(_fmt, ...)