Skip to content

Commit

Permalink
Regression without ffmpeg fix
Browse files Browse the repository at this point in the history
This commit resolves a regression error when selecting the without-ffmpeg option.

1.  The ffmpeg configuration options are now valid whether or not the user has
    included ffmpeg.  Instead the user is notified when ffmpeg options are
    requested.

2.  The initial consolidation of the HAVE_FFMPEG duplicated the public functions
    in the #else (no ffmpeg) section.  This commit changes this so that the #IF
    are inside of the public functions so we don't have to worry about keeping
    the parameters the same between them.

3.  The timevalue was added to the ffmpeg header for the situation when
    ffmpeg is not included.
  • Loading branch information
Mr-DaveDev committed Dec 26, 2016
1 parent 2345295 commit 28f1abf
Show file tree
Hide file tree
Showing 3 changed files with 437 additions and 414 deletions.
2 changes: 0 additions & 2 deletions conf.c
Expand Up @@ -1036,7 +1036,6 @@ config_param config_params[] = {
copy_string,
print_string
},
#ifdef HAVE_FFMPEG
{
"movie_filename",
"# File path for motion triggered ffmpeg films (movies) relative to target_dir\n"
Expand All @@ -1062,7 +1061,6 @@ config_param config_params[] = {
copy_string,
print_string
},
#endif /* HAVE_FFMPEG */
{
"ipv6_enabled",
"\n############################################################\n"
Expand Down

0 comments on commit 28f1abf

Please sign in to comment.