mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-04-29 02:13:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Swap PKG_CONFIG_PATH and user spec

Browse Source
This commit is contained in:
Mr Dave
2015-09-30 20:41:45 -06:00
parent 2f0fd7dec1
commit 58e065e4f0
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@@ -1,4 +1,5 @@
Summary of Changes
* Swap sequence of user ffmpeg path and PKG_CONFIG_PATH
* Allow : in non standard locations of netcam_url path.
* Eliminated the use of coded_frame (Was a redundant assignment)
* Revise HEVC to use H264 for older ffmpeg

2
configure.ac
View File

@@ -380,7 +380,7 @@ AC_ARG_WITH([ffmpeg],
AS_IF([test "x$with_ffmpeg" != "xno"], [
AS_IF([test "x$with_ffmpeg" != "xyes"], [
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${with_ffmpeg}/lib/pkgconfig
PKG_CONFIG_PATH=${with_ffmpeg}/lib/pkgconfig:$PKG_CONFIG_PATH
export PKG_CONFIG_PATH
])
PKG_CHECK_MODULES([FFMPEG], libavutil libavformat libavcodec libswscale, HAVE_FFMPEG=yes)