From 28b7cb2a4297c78b9c08c9ce29a648aeb22120d0 Mon Sep 17 00:00:00 2001 From: Angel Carpintero Date: Fri, 28 Feb 2014 02:12:46 +0100 Subject: [PATCH] Update CHANGELOG and fix configure for RSTP --- CHANGELOG | 2 ++ configure | 20 ++++++++++---------- configure.in | 2 +- motion-dist.conf.in | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7c7f11e..10ca2c2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -48,6 +48,7 @@ Features * Added codec Ogg/Theora as new output format for regular movies. http://www.lavrsen.dk/foswiki/bin/view/Motion/OggTimelapse (Michael Luich) * Added support for ffmpeg 0.11 new API. + * Added RSTP support for netcam ( merge https://github.com/hyperbolic2346/motion ) Bugfixes * Avoid segfault detecting strerror_r() version GNU or SUSv3. (Angel Carpintero) @@ -82,6 +83,7 @@ Bugfixes * Avoid segfault when text_left or text_right uses non supported chars. * Fixed leak in vloopback. * Fixed a build of motion for some kernel version with not good videodev.h + * Netcam Modulo 8 3.2.12 Summary of Changes diff --git a/configure b/configure index 7ba55d0..2f5d804 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for motion trunkREVUNKNOWN. +# Generated by GNU Autoconf 2.69 for motion Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='motion' PACKAGE_TARNAME='motion' -PACKAGE_VERSION='trunkREVUNKNOWN' -PACKAGE_STRING='motion trunkREVUNKNOWN' +PACKAGE_VERSION='Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54' +PACKAGE_STRING='motion Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1245,7 +1245,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures motion trunkREVUNKNOWN to adapt to many kinds of systems. +\`configure' configures motion Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1306,7 +1306,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of motion trunkREVUNKNOWN:";; + short | recursive ) echo "Configuration of motion Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54:";; esac cat <<\_ACEOF @@ -1454,7 +1454,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -motion configure trunkREVUNKNOWN +motion configure Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2056,7 +2056,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by motion $as_me trunkREVUNKNOWN, which was +It was created by motion $as_me Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -6073,7 +6073,7 @@ if test "x$ac_cv_func_av_get_media_type_string" = xyes; then : $as_echo "#define have_av_get_media_type_string 1" >>confdefs.h fi -0 + # @@ -6605,7 +6605,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by motion $as_me trunkREVUNKNOWN, which was +This file was extended by motion $as_me Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6667,7 +6667,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -motion config.status trunkREVUNKNOWN +motion config.status Git-22b946b3a96e3d1a78a9019ddd47ea9d596eea54 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 2bf2b45..cd97ad9 100644 --- a/configure.in +++ b/configure.in @@ -1221,7 +1221,7 @@ AC_CHECK_FUNC(avformat_alloc_context, AC_DEFINE([have_avformat_alloc_context],1, AC_CHECK_FUNC(av_avformat_alloc_context, AC_DEFINE([have_av_avformat_alloc_context],1,[Define to 1 if you have av_avformat_alloc_context support])) AC_CHECK_FUNC(av_register_protocol2, AC_DEFINE([have_av_register_protocol2],1,[Define to 1 if you have av_register_protocol2 support])) AC_CHECK_FUNC(av_register_protocol, AC_DEFINE([have_av_register_protocol],1,[Define to 1 if you have av_register_protocol support])) -AC_CHECK_FUNC(av_get_media_type_string, AC_DEFINE([have_av_get_media_type_string],1,[Define to 1 if you have av_get_media_type_string support]))0 +AC_CHECK_FUNC(av_get_media_type_string, AC_DEFINE([have_av_get_media_type_string],1,[Define to 1 if you have av_get_media_type_string support])) # diff --git a/motion-dist.conf.in b/motion-dist.conf.in index 30886bc..630cbf8 100644 --- a/motion-dist.conf.in +++ b/motion-dist.conf.in @@ -101,7 +101,7 @@ framerate 2 # This option is used when you want to capture images at a rate lower than 2 per second. minimum_frame_time 0 -# URL to use if you are using a network camera, size will be autodetected (incl http:// ftp:// mjpg:// or file:///) +# URL to use if you are using a network camera, size will be autodetected (incl http:// ftp:// mjpg:// rstp:// or file:///) # Must be a URL that returns single jpeg pictures or a raw mjpeg stream. Default: Not defined ; netcam_url value