Upgrade motion to 3.2.10.1 (#3678)

[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 a56201e733d55fe004f2216f1f209eb383dd0f4b..9c04e1396f605806032ee8c1a0e642e203e44eac 100644 (file)
--- a/multimedia/motion/patches/001-ffmpeg.patch
+++ b/multimedia/motion/patches/001-ffmpeg.patch
@@ -1,8 +1,6 @@
-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)
+--- a/motion.c
++++ b/motion.c
+@@ -1611,6 +1611,7 @@
                 * httpd-control snaps are always enabled.
                 */
  
@@ -10,8 +8,8 @@ Index: motion-3.2.9/motion.c
                /* time_current_frame is used both for snapshot and timelapse features */
                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);
+@@ -1620,7 +1621,7 @@
+                       event(cnt, EVENT_IMAGE_SNAPSHOT, cnt->current_image->image, NULL, NULL, &cnt->current_image->timestamp_tm);
                        cnt->snapshot = 0;
                }
 -
@@ -19,7 +17,7 @@ Index: motion-3.2.9/motion.c
  
        /***** MOTION LOOP - TIMELAPSE FEATURE SECTION *****/
  
-@@ -1369,9 +1370,9 @@ static void *motion_loop(void *arg)
+@@ -1695,9 +1696,9 @@
                        event(cnt, EVENT_TIMELAPSEEND, NULL, NULL, NULL, cnt->currenttime_tm);