ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged the deinterlacing code, although only four field is optimized so far, and is still not working perfectly. 

1) Fixed compile errors that may occur when compiling with gcc 4.7 or newer.
2) Modified the check for libavcodec to work correctly with the latest versions of ffmpeg.
This commit is contained in:
Kfir Itzhak 2012-07-17 12:23:13 +03:00
parent ed2e3a8ce0
commit 0ef29743f2
7 changed files with 594 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aclocal.m4 vendored
View File

@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.65. [m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to. You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])]) To do so, use the procedure documented by the package, typically `autoreconf'.])])

995
configure vendored
View File

File diff suppressed because it is too large Load Diff

4
configure.ac
View File

@ -89,7 +89,7 @@ AC_ARG_WITH(ffmpeg,
) )
AC_SUBST(FFMPEG_PREFIX) AC_SUBST(FFMPEG_PREFIX)
FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}" FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}"
FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include" FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include -D__STDC_CONSTANT_MACROS"
AC_SUBST(FFMPEG_LIBS) AC_SUBST(FFMPEG_LIBS)
AC_SUBST(FFMPEG_CFLAGS) AC_SUBST(FFMPEG_CFLAGS)
@ -276,7 +276,7 @@ AC_CHECK_LIB(x264,x264_predict_16x16_init)
AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming)) AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
# Don't bother to warn about this one # Don't bother to warn about this one
AC_CHECK_LIB(avcore,av_image_copy,,) AC_CHECK_LIB(avcore,av_image_copy,,)
AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming)) AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming)) AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming)) AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
AC_CHECK_LIB(swscale,sws_scale,,,-lswscale) AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)

2
src/Makefile.am
View File

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = gnu AUTOMAKE_OPTIONS = gnu
AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -finline-functions -fomit-frame-pointer -D__STDC_CONSTANT_MACROS AM_CPPFLAGS = @MYSQL_CFLAGS@ -Wall -finline-functions -fomit-frame-pointer
#AM_CXXFLAGS = -frepo #AM_CXXFLAGS = -frepo
CLEANFILES = *.rpo CLEANFILES = *.rpo

2
src/Makefile.in
View File

@ -242,7 +242,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = gnu AUTOMAKE_OPTIONS = gnu
AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -finline-functions AM_CPPFLAGS = @MYSQL_CFLAGS@ -Wall -finline-functions -fomit-frame-pointer
#AM_CXXFLAGS = -frepo #AM_CXXFLAGS = -frepo
CLEANFILES = *.rpo CLEANFILES = *.rpo

1
src/zm_logger.h
View File

@ -20,6 +20,7 @@
#ifndef ZM_LOGGER_H #ifndef ZM_LOGGER_H
#define ZM_LOGGER_H #define ZM_LOGGER_H
#include <unistd.h>
#include <string> #include <string>
#include <map> #include <map>
#include <mysql/mysql.h> #include <mysql/mysql.h>

1
src/zm_thread.h
View File

@ -20,6 +20,7 @@
#ifndef ZM_THREAD_H #ifndef ZM_THREAD_H
#define ZM_THREAD_H #define ZM_THREAD_H
#include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include "zm_exception.h" #include "zm_exception.h"
#include "zm_utils.h" #include "zm_utils.h"