Update motion to a recent snapshot (#1538)
[openwrt/svn-archive/archive.git] / multimedia / motion / patches / 001-ffmpeg.patch
index 1f4c73eafae8960932dddb0c5e2845be4fb6121b..50c57484ccebeb1962d96ecbb444fe3f3f87c290 100644 (file)
@@ -1,38 +1,31 @@
-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
+diff -x .svn -ruN motion-3.2.8.old/motion.c motion-3.2.8/motion.c
+--- motion-3.2.8.old/motion.c  2007-03-31 12:54:31.000000000 +0200
++++ motion-3.2.8/motion.c      2007-03-31 13:08:27.000000000 +0200
+@@ -1282,6 +1282,7 @@
                 * httpd-control snaps are always enabled.
                 */
--              
-+#ifdef HAVE_FFMPEG            
++#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 @@
+               time_current_frame = cnt->currenttime;
+@@ -1291,7 +1292,7 @@
+                       event(cnt, EVENT_IMAGE_SNAPSHOT, newimg, NULL, NULL, cnt->currenttime_tm);
                        cnt->snapshot = 0;
                }
 -
 +#endif /* HAVE_FFMPEG */
        /***** MOTION LOOP - TIMELAPSE FEATURE SECTION *****/
  
- #ifdef HAVE_FFMPEG
-@@ -1331,10 +1331,9 @@
+@@ -1366,9 +1367,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 *****/
++              time_last_frame = time_current_frame;
+ #endif /* HAVE_FFMPEG */
+-              time_last_frame = time_current_frame;
  
-Only in motion-3.2.5.1-old/: motion.c.orig
+       /***** MOTION LOOP - VIDEO LOOPBACK SECTION *****/