Skip to content

Commit

Permalink
Update CHANGELOG and fix configure for RSTP
Browse files Browse the repository at this point in the history
  • Loading branch information
sackmotion committed Feb 28, 2014
1 parent 22b946b commit 28b7cb2
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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=''

Expand Down Expand Up @@ -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]...
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 $@
Expand Down Expand Up @@ -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



#
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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]))


#
Expand Down
2 changes: 1 addition & 1 deletion motion-dist.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 28b7cb2

Please sign in to comment.