diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-03-17 20:08:06 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-03-17 20:08:06 +0000 |
| commit | 805ca21a303b1dd83852cf1b5bfe95463787fccd (patch) | |
| tree | bf23c7721641f7fbee1936f13cdae131e95972fb /package/motion/patches/01-ffmpeg.patch | |
| parent | fa25bd09d439cfe68c8fd2a809a5986882bd8e71 (diff) | |
Added motion, thanks to Nathan True !
Fixed menuconfig symbol
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3395 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/motion/patches/01-ffmpeg.patch')
| -rw-r--r-- | package/motion/patches/01-ffmpeg.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/package/motion/patches/01-ffmpeg.patch b/package/motion/patches/01-ffmpeg.patch new file mode 100644 index 000000000..1f4c73eaf --- /dev/null +++ b/package/motion/patches/01-ffmpeg.patch @@ -0,0 +1,38 @@ +diff -ur motion-3.2.5.1-old/motion.c motion-3.2.5.1/motion.c +--- motion-3.2.5.1-old/motion.c 2006-03-17 10:05:13.490000000 -0800 ++++ motion-3.2.5.1/motion.c 2006-03-17 10:03:38.020000000 -0800 +@@ -1246,10 +1246,10 @@ + * Note: Negative value means SIGALRM snaps are enabled + * httpd-control snaps are always enabled. + */ +- ++#ifdef HAVE_FFMPEG + /* time_current_frame is used both for snapshot and timelapse features */ + time_current_frame = cnt->currenttime; +- ++ + if ( (cnt->conf.snapshot_interval > 0 && cnt->shots == 0 && + time_current_frame % cnt->conf.snapshot_interval <= time_last_frame % cnt->conf.snapshot_interval) || + cnt->snapshot) { +@@ -1257,7 +1257,7 @@ + cnt->snapshot = 0; + } + +- ++#endif /* HAVE_FFMPEG */ + /***** MOTION LOOP - TIMELAPSE FEATURE SECTION *****/ + + #ifdef HAVE_FFMPEG +@@ -1331,10 +1331,9 @@ + event(cnt, EVENT_TIMELAPSEEND, NULL, NULL, NULL, cnt->currenttime_tm); + + +-#endif /* HAVE_FFMPEG */ + + time_last_frame = time_current_frame; +- ++#endif /* HAVE_FFMPEG */ + + /***** MOTION LOOP - VIDEO LOOPBACK SECTION *****/ + +Only in motion-3.2.5.1-old/: motion.c.orig |