packages: forgot an updated bluez-utils patch

[openwrt/svn-archive/archive.git] / multimedia / motion / patches / 001-ffmpeg.patch

diff --git a/multimedia/motion/patches/001-ffmpeg.patch b/multimedia/motion/patches/001-ffmpeg.patch
index 1f4c73eafae8960932dddb0c5e2845be4fb6121b..a56201e733d55fe004f2216f1f209eb383dd0f4b 100644 (file)
--- a/multimedia/motion/patches/001-ffmpeg.patch
+++ b/multimedia/motion/patches/001-ffmpeg.patch
@@ -1,38 +1,32 @@
-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
+Index: motion-3.2.9/motion.c
+===================================================================
+--- motion-3.2.9.orig/motion.c
++++ motion-3.2.9/motion.c
+@@ -1285,6 +1285,7 @@ static void *motion_loop(void *arg)
                 * 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;
+ 
+@@ -1294,7 +1295,7 @@ static void *motion_loop(void *arg)
+                       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 @@
+@@ -1369,9 +1370,9 @@ static void *motion_loop(void *arg)
                        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 *****/