Timelapse revision of swf to mpg

Author: Mr-DaveDev

event.c

@@ -700,7 +700,7 @@ static void event_ffmpeg_timelapse(struct context *cnt,
     if (!cnt->ffmpeg_timelapse) {
         char tmp[PATH_MAX];
         const char *timepath;
-        const char *codec_swf = "swf";
+        const char *codec_mpg = "mpg";
         const char *codec_mpeg = "mpeg4";
 
         /*
@@ -730,11 +730,11 @@ static void event_ffmpeg_timelapse(struct context *cnt,
             v = u + (width * height) / 4;
         }
 
-        if (strcmp(cnt->conf.ffmpeg_video_codec,"swf") == 0) {
-            MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, "%s: Timelapse using swf codec.");
+        if (strcmp(cnt->conf.ffmpeg_video_codec,"mpg") == 0) {
+            MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, "%s: Timelapse using mpg codec.");
             MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, "%s: Events will be appended to file");
             cnt->ffmpeg_timelapse =
-                ffmpeg_open(codec_swf,cnt->timelapsefilename, y, u, v
+                ffmpeg_open(codec_mpg,cnt->timelapsefilename, y, u, v
                         ,cnt->imgs.width, cnt->imgs.height, 24
                         ,cnt->conf.ffmpeg_bps,cnt->conf.ffmpeg_vbr,TIMELAPSE_APPEND);
         } else {

ffmpeg.c

@@ -207,7 +207,7 @@ static AVOutputFormat *get_oformat(const char *codec, char *filename){
      * We also dynamically add the file extension to the filename here.
      */
     if (strcmp(codec, "tlapse") == 0) {
-        ext = ".swf";
+        ext = ".mpg";
         of = av_guess_format ("mpeg2video", NULL, NULL);
         if (of) of->video_codec = MY_CODEC_ID_MPEG2VIDEO;
     } else if (strcmp(codec, "mpeg4") == 0) {

motion-dist.conf.in

@@ -308,7 +308,7 @@ ffmpeg_variable_bitrate 0
 
 # Codec to used by ffmpeg for the video compression.
 # Timelapse videos have two options.
-#   swf - Creates swf file with mpeg-2 encoding.
+#   mpg - Creates mpg file with mpeg-2 encoding.
 #     If motion is shutdown and restarted, new pics will be appended
 #     to any previously created file with name indicated for timelapse.
 #   mpeg4 - Creates avi file with the default encoding.
@@ -460,12 +460,12 @@ picture_filename %v-%Y%m%d%H%M%S-%q
 
 # File path for motion triggered ffmpeg films (movies) relative to target_dir
 # Default: %v-%Y%m%d%H%M%S
-# File extensions(.swf .avi) are automatically added so do not include them
+# File extensions(.mpg .avi) are automatically added so do not include them
 movie_filename %v-%Y%m%d%H%M%S
 
 # File path for timelapse movies relative to target_dir
 # Default: %Y%m%d-timelapse
-# File extensions(.swf .avi) are automatically added so do not include them
+# File extensions(.mpg .avi) are automatically added so do not include them
 timelapse_filename %Y%m%d-timelapse
 
 ############################################################

motion.1

@@ -952,7 +952,7 @@ Values:
 .RS
 Timelapse videos:
 .RS
-swf - Creates swf file with mpeg-2 encoding.
+mpg - Creates mpg file with mpeg-2 encoding.
 mpeg4 - Creates avi file with the default encoding.
 .RE
 Motion videos:
@@ -975,7 +975,7 @@ Description:
 .RS
 The container and codec to use when creating videos.  
 When creating timelapse videos, there are only two options and the processing varies due to container/codec limitations.  
-For swf timelapse videos, if motion is shutdown and restarted, new pics will be appended 
+For mpg timelapse videos, if motion is shutdown and restarted, new pics will be appended 
 to any previously created file with name indicated for timelapse.
 For mpeg4 timelapse videos, if motion is shutdown and restarted, new pics will create a 
 new file with the name indicated for timelapse.
@@ -1255,7 +1255,7 @@ Description:
 .fi
 .RS
 File path for timelapse movies relative to target_dir.
-The file extensions(.swf .avi) are automatically added so do not include them
+The file extensions(.mpg .avi) are automatically added so do not include them
 This option accepts the conversion specifiers included at the end of this manual.
 .RE
 .RE

motion_guide.html

@@ -3315,15 +3315,15 @@ <h3><a name="ffmpeg_video_codec"></a> ffmpeg_video_codec </h3>
 <p></p> 
 <ul>
   <li> Type: Discrete Strings</li>
-  <li> Range / Valid values: mpeg1, mpeg4, msmpeg4, swf, flv, ffv1</li>
+  <li> Range / Valid values: mpeg1, mpeg4, msmpeg4, swf, flv, ffv1, mov, ogg, mp4, mkv, hevc</li>
   <li> Default: mpeg4</li>
 </ul> 
 <p></p>
 Codec to be used by ffmpeg for the video compression. 
 <p></p>
 Timelapse videos have two options.
 <ul>
-<li>swf - Creates swf file with mpeg-2 encoding. If motion is shutdown and restarted, new pics will be appended
+<li>mpg - Creates mpg file with mpeg-2 encoding. If motion is shutdown and restarted, new pics will be appended
      to any previously created file with name indicated for timelapse.</li>
 <li>mpeg4 - Creates avi file with the default encoding.  If motion is shutdown and restarted, new pics will 
 create a new file with the name indicated for timelapse.</li>