diff --git a/configure.ac b/configure.ac index a6b757e0..8771c13d 100644 --- a/configure.ac +++ b/configure.ac @@ -232,7 +232,7 @@ AS_IF([test "${MMAL}" = "no"], [ AM_CONDITIONAL([INC_MMAL_SRC],[test x${MMAL} = xyes]) ############################################################################## -### Check for ffmpeg - Optional. +### Check for ffmpeg ############################################################################## FFMPEG_VER="--" AC_ARG_WITH([ffmpeg], @@ -243,7 +243,7 @@ AC_ARG_WITH([ffmpeg], AS_IF([test "${FFMPEG}" = "no"], [ AC_MSG_CHECKING(for FFmpeg) - AC_MSG_RESULT(skipped) + AC_MSG_ERROR([Package ffmpeg is required.]) ],[ AC_MSG_CHECKING(FFmpeg pkg-config path) TEMP_PATH=$PKG_CONFIG_PATH @@ -261,11 +261,10 @@ AS_IF([test "${FFMPEG}" = "no"], [ FFMPEG_VER=`pkg-config --modversion libavformat` TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags $FFMPEG_DEPS` TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs $FFMPEG_DEPS` - AC_DEFINE([HAVE_FFMPEG], [1], [Define to 1 if FFMPEG is around]) AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) - AC_MSG_ERROR([Required ffmpeg packages 'libavutil-dev libavformat-dev libavcodec-dev libswscale-dev libavdevice-dev' were not found. Please check motion_guide.html and install necessary dependencies or use the '--without-ffmpeg' configuration option.]) + AC_MSG_ERROR([Required ffmpeg packages 'libavutil-dev libavformat-dev libavcodec-dev libswscale-dev libavdevice-dev' were not found. Please check motion_guide.html and install necessary dependencies]) ] ) PKG_CONFIG_PATH=$TEMP_PATH diff --git a/po/da.po b/po/da.po index 45b02c53..58f1e7f1 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 11:59-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/de.po b/po/de.po index f780ee53..14fc1dfe 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 11:59-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1126,10 +1126,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1162,10 +1158,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1658,14 +1650,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2270,10 +2254,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/es.po b/po/es.po index c3655f18..6c410556 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:00-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1126,10 +1126,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1162,10 +1158,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1658,14 +1650,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2270,10 +2254,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/fi.po b/po/fi.po index 84ecc619..d20c396c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:00-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/fr.po b/po/fr.po index 0c2a9a75..ec228bc3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:01-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1131,10 +1131,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1167,10 +1163,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1663,14 +1655,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2275,10 +2259,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/it.po b/po/it.po index 2671f593..789003ba 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:02-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/ja.po b/po/ja.po index 49d6bf43..0b257df8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:02-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/ko.po b/po/ko.po index 9ca94f52..3399516c 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:02-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/li.po b/po/li.po index 5d21c8ab..fcb9d297 100644 --- a/po/li.po +++ b/po/li.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:02-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1126,10 +1126,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1162,10 +1158,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1658,14 +1650,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2270,10 +2254,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/nl.po b/po/nl.po index df0675ed..5609f44d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:03-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/no.po b/po/no.po index 67b10912..ae6ee876 100644 --- a/po/no.po +++ b/po/no.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:03-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/pt.po b/po/pt.po index e58bbd6a..6811016a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:03-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/sv.po b/po/sv.po index 5f96ceca..e9a95855 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:04-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/po/zh.po b/po/zh.po index 82cef675..89d57f64 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:10-0600\n" +"POT-Creation-Date: 2019-09-25 21:34-0600\n" "PO-Revision-Date: 2018-10-13 12:04-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -1125,10 +1125,6 @@ msgstr "" msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg functionality included" -msgstr "" - #: src/ffmpeg.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" @@ -1161,10 +1157,6 @@ msgstr "" msgid "Buffered packet" msgstr "" -#: src/ffmpeg.c -msgid "No ffmpeg support" -msgstr "" - #: src/jpegutils.c #, c-format msgid "%s: Given jpeg buffer was too small" @@ -1657,14 +1649,6 @@ msgstr "" msgid "mmal : not available" msgstr "" -#: src/motion.c -msgid "ffmpeg : available" -msgstr "" - -#: src/motion.c -msgid "ffmpeg : not available" -msgstr "" - #: src/motion.c msgid "mysql : available" msgstr "" @@ -2269,10 +2253,6 @@ msgstr "" msgid "Failed trying to read first image - retval:%d" msgstr "" -#: src/netcam_rtsp.c -msgid "FFmpeg/Libav not found on computer. No RTSP support" -msgstr "" - #: src/netcam_rtsp.c #, c-format msgid "%s: Shutting down network camera." diff --git a/src/ffmpeg.c b/src/ffmpeg.c index 3af961a3..1d27a0b2 100644 --- a/src/ffmpeg.c +++ b/src/ffmpeg.c @@ -24,8 +24,6 @@ #include "translate.h" #include "motion.h" -#ifdef HAVE_FFMPEG - /**************************************************************************** * The section below is the "my" section of functions. * These are designed to be extremely simple version specific @@ -1424,15 +1422,11 @@ static void ffmpeg_put_pix_yuv420(struct ffmpeg *ffmpeg, struct image_data *img_ } -#endif /* HAVE_FFMPEG */ - /**************************************************************************** **************************************************************************** ****************************************************************************/ void ffmpeg_global_init(void){ -#ifdef HAVE_FFMPEG - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO ,_("ffmpeg libavcodec version %d.%d.%d" @@ -1462,15 +1456,9 @@ void ffmpeg_global_init(void){ } #endif -#else /* No FFMPEG */ - - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO, _("No ffmpeg functionality included")); - -#endif /* HAVE_FFMPEG */ } void ffmpeg_global_deinit(void) { -#ifdef HAVE_FFMPEG avformat_network_deinit(); @@ -1484,17 +1472,10 @@ void ffmpeg_global_deinit(void) { #endif -#else /* No FFMPEG */ - - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO, _("No ffmpeg functionality included")); - -#endif /* HAVE_FFMPEG */ } int ffmpeg_open(struct ffmpeg *ffmpeg){ -#ifdef HAVE_FFMPEG - int retcd; ffmpeg->oc = avformat_alloc_context(); @@ -1551,19 +1532,9 @@ int ffmpeg_open(struct ffmpeg *ffmpeg){ return 0; -#else /* No FFMPEG */ - - if (ffmpeg) { - MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO, _("No ffmpeg functionality included")); - } - return -1; - -#endif /* HAVE_FFMPEG */ - } void ffmpeg_close(struct ffmpeg *ffmpeg){ -#ifdef HAVE_FFMPEG if (ffmpeg != NULL) { @@ -1584,14 +1555,11 @@ void ffmpeg_close(struct ffmpeg *ffmpeg){ ffmpeg_free_nal(ffmpeg); } -#else - if (ffmpeg != NULL) free(ffmpeg); -#endif // HAVE_FFMPEG } int ffmpeg_put_image(struct ffmpeg *ffmpeg, struct image_data *img_data, const struct timeval *tv1){ -#ifdef HAVE_FFMPEG + int retcd = 0; int cnt = 0; @@ -1643,16 +1611,9 @@ int ffmpeg_put_image(struct ffmpeg *ffmpeg, struct image_data *img_data, const s return retcd; -#else - if (ffmpeg && img_data && tv1) { - MOTION_LOG(DBG, TYPE_ENCODER, NO_ERRNO, _("No ffmpeg support")); - } - return 0; -#endif // HAVE_FFMPEG } void ffmpeg_reset_movie_start_time(struct ffmpeg *ffmpeg, const struct timeval *tv1){ -#ifdef HAVE_FFMPEG int64_t one_frame_interval = av_rescale_q(1,(AVRational){1, ffmpeg->fps},ffmpeg->video_st->time_base); if (one_frame_interval <= 0) one_frame_interval = 1; @@ -1661,9 +1622,4 @@ void ffmpeg_reset_movie_start_time(struct ffmpeg *ffmpeg, const struct timeval * ffmpeg->start_time.tv_sec = tv1->tv_sec; ffmpeg->start_time.tv_usec = tv1->tv_usec; -#else - if (ffmpeg && tv1) { - MOTION_LOG(DBG, TYPE_ENCODER, NO_ERRNO, _("No ffmpeg support")); - } -#endif // HAVE_FFMPEG } diff --git a/src/ffmpeg.h b/src/ffmpeg.h index c687976b..5cc9e91c 100644 --- a/src/ffmpeg.h +++ b/src/ffmpeg.h @@ -23,8 +23,6 @@ enum USER_CODEC { USER_CODEC_DEFAULT /* All other default codecs */ }; -#ifdef HAVE_FFMPEG - #include #include #include @@ -41,9 +39,6 @@ enum USER_CODEC { #define MyPixelFormat PixelFormat #endif //Libavformat >= 56 -#endif // HAVE_FFMPEG - -#ifdef HAVE_FFMPEG struct ffmpeg { AVFormatContext *oc; AVStream *video_st; @@ -73,32 +68,8 @@ struct ffmpeg { char *nal_info; int nal_info_len; }; -#else -struct ffmpeg { - struct rtsp_context *rtsp_data; - int width; - int height; - enum TIMELAPSE_TYPE tlapse; - int fps; - int bps; - char *filename; - int quality; - const char *codec_name; - int64_t last_pts; - int64_t base_pts; - int test_mode; - int gop_cnt; - struct timeval start_time; - int high_resolution; - int motion_images; - int passthrough; -}; -#endif // HAVE_FFMPEG - -#ifdef HAVE_FFMPEG - AVFrame *my_frame_alloc(void); void my_frame_free(AVFrame *frame); void my_packet_unref(AVPacket pkt); @@ -108,8 +79,6 @@ int my_image_copy_to_buffer(AVFrame *frame,uint8_t *buffer_ptr,enum MyPixelForma int my_image_fill_arrays(AVFrame *frame,uint8_t *buffer_ptr,enum MyPixelFormat pix_fmt,int width,int height); int my_copy_packet(AVPacket *dest_pkt, AVPacket *src_pkt); -#endif /* HAVE_FFMPEG */ - void ffmpeg_global_init(void); void ffmpeg_global_deinit(void); void ffmpeg_avcodec_log(void *, int, const char *, va_list); diff --git a/src/motion.c b/src/motion.c index e672e4d5..dab2eb04 100644 --- a/src/motion.c +++ b/src/motion.c @@ -3145,12 +3145,6 @@ static void motion_ntc(void){ MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("mmal : not available")); #endif - #ifdef HAVE_FFMPEG - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("ffmpeg : available")); - #else - MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,_("ffmpeg : not available")); - #endif - #ifdef HAVE_MYSQL MOTION_LOG(DBG, TYPE_DB, NO_ERRNO,_("mysql : available")); #else @@ -4100,7 +4094,7 @@ void util_threadname_get(char *threadname){ } int util_check_passthrough(struct context *cnt){ -#if (HAVE_FFMPEG && LIBAVFORMAT_VERSION_MAJOR < 55) +#if (LIBAVFORMAT_VERSION_MAJOR < 55) if (cnt->movie_passthrough) MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO ,_("FFMPEG version too old. Disabling pass-through processing.")); diff --git a/src/netcam_rtsp.c b/src/netcam_rtsp.c index 6b5bf39b..8e75425a 100644 --- a/src/netcam_rtsp.c +++ b/src/netcam_rtsp.c @@ -1,19 +1,10 @@ /*********************************************************** - * In the top section are the functions that are used - * when processing the camera feed. Since these functions - * are internal to the RTSP module, and many require FFmpeg - * structures in their declarations, they are within the - * HAVE_FFMPEG block that eliminates them entirely when - * FFmpeg is not present. * * The functions: * netcam_rtsp_setup * netcam_rtsp_next * netcam_rtsp_cleanup - * are called from video_common.c therefore must be defined even - * if FFmpeg is not present. They must also not have FFmpeg - * structures in the declarations. Simple error - * messages are raised if called when no FFmpeg is found. + * are called from video_common.c * * Additional note: Although this module is called netcam_rtsp, * it actually handles more camera types than just rtsp. @@ -29,9 +20,6 @@ #include "rotate.h" /* already includes motion.h */ #include "netcam_rtsp.h" #include "video_v4l2.h" /* Needed to validate palette for v4l2 via netcam */ - -#ifdef HAVE_FFMPEG - #include "ffmpeg.h" void netcam_check_buffsize(netcam_buff_ptr buff, size_t numbytes) @@ -1719,14 +1707,7 @@ static int netcam_rtsp_start_handler(struct rtsp_context *rtsp_data){ } -/********************************************************* - * This ends the section of functions that rely upon FFmpeg - ***********************************************************/ -#endif /* End HAVE_FFMPEG */ - - int netcam_rtsp_setup(struct context *cnt){ -#ifdef HAVE_FFMPEG int retcd; int indx_cam, indx_max; @@ -1796,16 +1777,10 @@ int netcam_rtsp_setup(struct context *cnt){ return 0; -#else /* No FFmpeg/Libav */ - /* Stop compiler warnings */ - if (cnt) - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, _("FFmpeg/Libav not found on computer. No RTSP support")); - return -1; -#endif /* End #ifdef HAVE_FFMPEG */ } int netcam_rtsp_next(struct context *cnt, struct image_data *img_data){ -#ifdef HAVE_FFMPEG + /* This is called from the motion loop thread */ if ((cnt->rtsp->status == RTSP_RECONNECTING) || @@ -1839,17 +1814,10 @@ int netcam_rtsp_next(struct context *cnt, struct image_data *img_data){ rotate_map(cnt, img_data); return 0; - -#else /* No FFmpeg/Libav */ - /* Stop compiler warnings */ - if ((cnt) || (img_data)) - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, _("FFmpeg/Libav not found on computer. No RTSP support")); - return -1; -#endif /* End #ifdef HAVE_FFMPEG */ } void netcam_rtsp_cleanup(struct context *cnt, int init_retry_flag){ -#ifdef HAVE_FFMPEG + /* * If the init_retry_flag is not set this function was * called while retrying the initial connection and there is @@ -1921,12 +1889,5 @@ void netcam_rtsp_cleanup(struct context *cnt, int init_retry_flag){ cnt->rtsp = NULL; cnt->rtsp_high = NULL; -#else /* No FFmpeg/Libav */ - /* Stop compiler warnings */ - if ((cnt) || (init_retry_flag)) - MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, _("FFmpeg/Libav not found on computer. No RTSP support")); - return; -#endif /* End #ifdef HAVE_FFMPEG */ - } diff --git a/src/netcam_rtsp.h b/src/netcam_rtsp.h index 8ec59de3..3f93670c 100644 --- a/src/netcam_rtsp.h +++ b/src/netcam_rtsp.h @@ -47,8 +47,6 @@ typedef struct netcam_image_buff { typedef netcam_buff *netcam_buff_ptr; -#ifdef HAVE_FFMPEG - #include #include #include @@ -120,16 +118,6 @@ struct rtsp_context { }; -#else /* Do not have FFmpeg */ - -struct rtsp_context { - int dummy; - pthread_t thread_id; - int handler_finished; -}; - -#endif /* end HAVE_FFMPEG */ - int netcam_rtsp_setup(struct context *cnt); int netcam_rtsp_next(struct context *cnt, struct image_data *img_data); void netcam_rtsp_cleanup(struct context *cnt, int init_retry_flag);