diff --git a/CHANGELOG b/CHANGELOG index f1f521e1..3c57c97d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,8 @@ Features (Angel Carpintero) * motion_locate new parameter names : red , center , redcross instead of only on, off. (Angel Carpintero) * Remove mjpegtools dependencies and integrate only needed functions from library. (Angel Carpintero) + * External pipe to allow external video encoders + http://www.lavrsen.dk/twiki/bin/view/Motion/DarkwindHackeronMotionPatching (Bill Payne, Angel Carpintero) Bugfixes * Fix Problem Encoding 1280x1024 resolution videos diff --git a/CREDITS b/CREDITS index fb20b479..e5fe962f 100644 --- a/CREDITS +++ b/CREDITS @@ -405,6 +405,8 @@ Angel Carpintero http://www.lavrsen.dk/twiki/bin/view/Motion/BugReport2008x06x19x123218 * Remove mjpegtools dependencies and integrate only needed functions from library. * Fix rotate for v4l2 devices using JPEG / MJPEG palettes. + * External pipe to allow external video encoders + http://www.lavrsen.dk/twiki/bin/view/Motion/DarkwindHackeronMotionPatching (Bill Payne, Angel Carpintero) Jared D * Change bayer2rgb24() to fix a problem with sn9c102 driver @@ -1079,6 +1081,10 @@ Onakra Mikko Paananen * Changed netcam open to use pipes and fixed authentication. +Bill Payne, + * External pipe to allow external video encoders + http://www.lavrsen.dk/twiki/bin/view/Motion/DarkwindHackeronMotionPatching (Angel Carpintero, Bill Payne) + Bowser Pete * Add swf codec to video creation. diff --git a/configure b/configure index 791a160e..4620b5c0 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.61 for motion trunk-r394. +# Generated by GNU Autoconf 2.61 for motion trunk-r398. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='motion' PACKAGE_TARNAME='motion' -PACKAGE_VERSION='trunk-r394' -PACKAGE_STRING='motion trunk-r394' +PACKAGE_VERSION='trunk-r398' +PACKAGE_STRING='motion trunk-r398' PACKAGE_BUGREPORT='' ac_unique_file="motion.c" @@ -1177,7 +1177,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 trunk-r394 to adapt to many kinds of systems. +\`configure' configures motion trunk-r398 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1238,7 +1238,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of motion trunk-r394:";; + short | recursive ) echo "Configuration of motion trunk-r398:";; esac cat <<\_ACEOF @@ -1374,7 +1374,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -motion configure trunk-r394 +motion configure trunk-r398 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1388,7 +1388,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 trunk-r394, which was +It was created by motion $as_me trunk-r398, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -8139,7 +8139,7 @@ exec 6>&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 trunk-r394, which was +This file was extended by motion $as_me trunk-r398, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8188,7 +8188,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -motion config.status trunk-r394 +motion config.status trunk-r398 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/jpegutils.c b/jpegutils.c index ec83e6b4..21c09705 100644 --- a/jpegutils.c +++ b/jpegutils.c @@ -51,8 +51,8 @@ */ -static void jpeg_buffer_src (j_decompress_ptr cinfo, unsigned char *buffer, - long num); +static void jpeg_buffer_src(j_decompress_ptr cinfo, unsigned char *buffer, + long num); static void jpeg_buffer_dest(j_compress_ptr cinfo, unsigned char *buffer, long len); static void jpeg_skip_ff(j_decompress_ptr cinfo); @@ -71,9 +71,9 @@ static void jpeg_skip_ff(j_decompress_ptr cinfo); * before any data is actually read. */ -static void init_source(j_decompress_ptr cinfo) +static void init_source(j_decompress_ptr cinfo ATTRIBUTE_UNUSED) { - /* no work necessary here */ + /* no work necessary here */ } @@ -118,7 +118,7 @@ static void skip_input_data(j_decompress_ptr cinfo, long num_bytes) * after all data has been read. Often a no-op. */ -static void term_source(j_decompress_ptr cinfo) +static void term_source(j_decompress_ptr cinfo ATTRIBUTE_UNUSED) { /* no work necessary here */ } @@ -184,7 +184,7 @@ static void jpeg_skip_ff(j_decompress_ptr cinfo) * before any data is actually written. */ -static void init_destination (j_compress_ptr cinfo) +static void init_destination(j_compress_ptr cinfo ATTRIBUTE_UNUSED) { /* No work necessary here */ } @@ -216,7 +216,7 @@ static boolean empty_output_buffer(j_compress_ptr cinfo) * for error exit. */ -static void term_destination(j_compress_ptr cinfo) +static void term_destination(j_compress_ptr cinfo ATTRIBUTE_UNUSED) { /* no work necessary here */ }