diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-10-07 11:57:20 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-07 11:57:20 +0000 |
| commit | d58a09110ccfa95f06c983fe796806f2e035c9d2 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /openwrt/package/motion/patches/01-ffmpeg.patch | |
| parent | af034797eeb62b62ac05442d5a688b28ccd0f16b (diff) | |
| download | mtk-20170518-d58a09110ccfa95f06c983fe796806f2e035c9d2.zip mtk-20170518-d58a09110ccfa95f06c983fe796806f2e035c9d2.tar.gz mtk-20170518-d58a09110ccfa95f06c983fe796806f2e035c9d2.tar.bz2 | |
move old kamikaze out of trunk - will put buildroot-ng in there as soon as all the developers are ready
SVN-Revision: 4944
Diffstat (limited to 'openwrt/package/motion/patches/01-ffmpeg.patch')
| -rw-r--r-- | openwrt/package/motion/patches/01-ffmpeg.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/openwrt/package/motion/patches/01-ffmpeg.patch b/openwrt/package/motion/patches/01-ffmpeg.patch deleted file mode 100644 index 1f4c73e..0000000 --- a/openwrt/package/motion/patches/01-ffmpeg.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 |