multimedia/motion/patches/01-ffmpeg.patch

   1 diff -ur motion-3.2.5.1-old/motion.c motion-3.2.5.1/motion.c
   2 --- motion-3.2.5.1-old/motion.c 2006-03-17 10:05:13.490000000 -0800
   3 +++ motion-3.2.5.1/motion.c     2006-03-17 10:03:38.020000000 -0800
   4 @@ -1246,10 +1246,10 @@
   5                  * Note: Negative value means SIGALRM snaps are enabled
   6                  * httpd-control snaps are always enabled.
   7                  */
   8 -
   9 +#ifdef HAVE_FFMPEG
  10                 /* time_current_frame is used both for snapshot and timelapse features */
  11                 time_current_frame = cnt->currenttime;
  12 -
  13 +
  14                 if ( (cnt->conf.snapshot_interval > 0 && cnt->shots == 0 &&
  15                       time_current_frame % cnt->conf.snapshot_interval <= time_last_frame % cnt->conf.snapshot_interval) ||
  16                     cnt->snapshot) {
  17 @@ -1257,7 +1257,7 @@
  18                         cnt->snapshot = 0;
  19                 }
  20
  21 -
  22 +#endif /* HAVE_FFMPEG */
  23         /***** MOTION LOOP - TIMELAPSE FEATURE SECTION *****/
  24
  25  #ifdef HAVE_FFMPEG
  26 @@ -1331,10 +1331,9 @@
  27                         event(cnt, EVENT_TIMELAPSEEND, NULL, NULL, NULL, cnt->currenttime_tm);
  28
  29
  30 -#endif /* HAVE_FFMPEG */
  31
  32                 time_last_frame = time_current_frame;
  33 -
  34 +#endif /* HAVE_FFMPEG */
  35
  36         /***** MOTION LOOP - VIDEO LOOPBACK SECTION *****/
  37
  38 Only in motion-3.2.5.1-old/: motion.c.orig