diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 9221e2f78..ca07a0f81 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -184,46 +184,32 @@ int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat
     }
   }
 
-  if (!oformat) {
-    if (format) {
-      oformat = av_guess_format(format, NULL, NULL);
-      if (!oformat) {
-        av_log(s, AV_LOG_ERROR, "Requested output format '%s' is not a suitable output format\n", format);
-        ret = AVERROR(EINVAL);
-      }
-    } else {
-      oformat = av_guess_format(NULL, filename, NULL);
-      if (!oformat) {
-        ret = AVERROR(EINVAL);
-        av_log(s, AV_LOG_ERROR, "Unable to find a suitable output format for '%s'\n", filename);
-      }
-    }
-  }
-
   if (ret) {
     avformat_free_context(s);
     return ret;
-  } else {
-    s->oformat = oformat;
-    if (s->oformat->priv_data_size > 0) {
-      s->priv_data = av_mallocz(s->oformat->priv_data_size);
-      if (s->priv_data) {
-        if (s->oformat->priv_class) {
-          *(const AVClass**)s->priv_data= s->oformat->priv_class;
-          av_opt_set_defaults(s->priv_data);
-        }
-      } else {
-        av_log(s, AV_LOG_ERROR, "Out of memory\n");
-        ret = AVERROR(ENOMEM);
-        return ret;
-      }
-      s->priv_data = NULL;
-    }
-
-    if (filename) strncpy(s->filename, filename, sizeof(s->filename));
-    *avctx = s;
-    return 0;
   }
+
+  s->oformat = oformat;
+#if 0
+  if (s->oformat->priv_data_size > 0) {
+      if (s->oformat->priv_class) {
+        // This looks wrong, we just allocated priv_data and now we are losing the pointer to it.FIXME
+        *(const AVClass**)s->priv_data = s->oformat->priv_class;
+        av_opt_set_defaults(s->priv_data);
+      } else {
+    s->priv_data = av_mallocz(s->oformat->priv_data_size);
+    if ( ! s->priv_data) {
+      av_log(s, AV_LOG_ERROR, "Out of memory\n");
+      ret = AVERROR(ENOMEM);
+      return ret;
+    }
+    s->priv_data = NULL;
+  }
+#endif
+
+  if (filename) strncpy(s->filename, filename, sizeof(s->filename));
+  *avctx = s;
+  return 0;
 }
 
 static void zm_log_fps(double d, const char *postfix) {
diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 79ed3d579..72e2270eb 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -285,10 +285,8 @@ int FfmpegCamera::OpenFfmpeg() {
   Info( "Stream open %s", mPath.c_str() );
 
 #if !LIBAVFORMAT_VERSION_CHECK(53, 6, 0, 6, 0)
-  Debug ( 1, "Calling av_find_stream_info" );
   if ( av_find_stream_info( mFormatContext ) < 0 )
 #else
-    Debug ( 1, "Calling avformat_find_stream_info" );
   if ( avformat_find_stream_info( mFormatContext, 0 ) < 0 )
 #endif
     Fatal( "Unable to find stream info from %s due to: %s", mPath.c_str(), strerror(errno) );
@@ -559,12 +557,12 @@ int FfmpegCamera::CloseFfmpeg() {
 
   if ( mVideoCodecContext ) {
     avcodec_close(mVideoCodecContext);
-    //av_free(mVideoCodecContext);
+    avcodec_free_context(&mVideoCodecContext);
     mVideoCodecContext = NULL; // Freed by av_close_input_file
   }
   if ( mAudioCodecContext ) {
     avcodec_close(mAudioCodecContext);
-    //av_free(mAudioCodecContext);
+    avcodec_free_context(&mAudioCodecContext);
     mAudioCodecContext = NULL; // Freed by av_close_input_file
   }
 
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 1003691a0..80684ad53 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -554,12 +554,16 @@ bool Monitor::connect() {
   // alarmed images that must be discarded when event is created
 
   // Couldn't we just make sure there is always enough frames in the ring buffer?
-    pre_event_buffer_count = pre_event_count + alarm_frame_count - 1;
-    pre_event_buffer = new ZMPacket[pre_event_buffer_count];
-    for ( int i = 0; i < pre_event_buffer_count; i++ ) {
-      pre_event_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder());
+  if ( purpose == ANALYSIS ) {
+    if ( analysis_fps ) {
+      pre_event_buffer_count = pre_event_count + alarm_frame_count - 1;
+      pre_event_buffer = new ZMPacket[pre_event_buffer_count];
+      for ( int i = 0; i < pre_event_buffer_count; i++ ) {
+        pre_event_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder());
+      }
     }
-Debug(3, "Success connecting");
+  }
+  Debug(3, "Success connecting");
   return true;
 } // Monitor::connect
 
@@ -1614,7 +1618,7 @@ Debug(3,"Not ready?");
   shared_data->last_read_time = now.tv_sec;
   mutex.unlock(); 
 
-  if ( analysis_fps ) {
+  if ( (purpose == ANALYSIS) && analysis_fps ) {
     // If analysis fps is set, add analysed image to dedicated pre event buffer
 Debug(3,"analysis fps image_count(%d) pre_event_buffer_count(%d)", image_count, pre_event_buffer_count );
     int pre_index = pre_event_buffer_count ? image_count%pre_event_buffer_count : 0;
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index fff0dd170..453e6a8e0 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -95,6 +95,23 @@ VideoStore::VideoStore(
 Debug(2,"Copied video context from input stream");
       zm_dump_codec(video_in_ctx);
 #endif
+    // Fix deprecated formats
+    switch ( video_in_ctx->pix_fmt ) {
+      case AV_PIX_FMT_YUVJ420P :
+        video_in_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
+        break;
+      case AV_PIX_FMT_YUVJ422P  :
+        video_in_ctx->pix_fmt = AV_PIX_FMT_YUV422P;
+        break;
+      case AV_PIX_FMT_YUVJ444P   :
+        video_in_ctx->pix_fmt = AV_PIX_FMT_YUV444P;
+        break;
+      case AV_PIX_FMT_YUVJ440P :
+        video_in_ctx->pix_fmt = AV_PIX_FMT_YUV440P;
+        break;
+      default:
+        break;
+    }
   } else {
     Debug(2, "No input ctx");
     video_in_ctx = avcodec_alloc_context3(NULL);
@@ -139,6 +156,24 @@ Debug(2,"Copied video context from input stream");
         Warning("Unsupported Orientation(%d)", orientation);
       }
     }
+    // Fix deprecated formats
+    switch ( video_out_ctx->pix_fmt ) {
+      case AV_PIX_FMT_YUVJ420P :
+        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
+        break;
+      case AV_PIX_FMT_YUVJ422P  :
+        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV422P;
+        break;
+      case AV_PIX_FMT_YUVJ444P   :
+        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV444P;
+        break;
+      case AV_PIX_FMT_YUVJ440P :
+        video_out_ctx->pix_fmt = AV_PIX_FMT_YUV440P;
+        break;
+      default:
+        break;
+    }
+
   } else {
 
     /** Create a new frame to store the */
@@ -462,8 +497,8 @@ bool VideoStore::open() {
 } // end bool VideoStore::open()
 
 void VideoStore::write_audio_packet( AVPacket &pkt ) {
-  Debug(2, "writing flushed packet pts(%d) dts(%d) duration(%d)", pkt.pts,
-      pkt.dts, pkt.duration);
+//Debug(2, "writing audio packet pts(%d) dts(%d) duration(%d)", pkt.pts,
+      //pkt.dts, pkt.duration);
   pkt.pts = audio_next_pts;
   pkt.dts = audio_next_dts;
 
@@ -474,7 +509,7 @@ void VideoStore::write_audio_packet( AVPacket &pkt ) {
   audio_next_pts += pkt.duration;
   audio_next_dts += pkt.duration;
 
-  Debug(2, "writing flushed packet pts(%d) dts(%d) duration(%d)", pkt.pts,
+  Debug(2, "writing audio packet pts(%d) dts(%d) duration(%d)", pkt.pts,
       pkt.dts, pkt.duration);
   pkt.stream_index = audio_out_stream->index;
   av_interleaved_write_frame(oc, &pkt);
@@ -591,18 +626,18 @@ Debug(3, "dts:%d, pts:%d, keyframe:%d", pkt.dts, pkt.pts, keyframe );
   // allocation/de-allocation constantly, or whether we can just re-use it.
   // Just do a file open/close/writeheader/etc.
   // What if we were only doing audio recording?
-  if ( video_out_stream ) {
-    avcodec_close(video_out_ctx);
-    video_out_ctx = NULL;
-    Debug(4, "Success freeing video_out_ctx");
-  }
 // Used by both audio and video conversions
     if ( in_frame ) {
       av_frame_free(&in_frame);
       in_frame = NULL;
     }
+  if ( audio_in_ctx ) {
+    avcodec_free_context(&audio_in_ctx);
+    audio_in_ctx = NULL;
+  }
   if ( audio_out_stream ) {
     avcodec_close(audio_out_ctx);
+    avcodec_free_context(&audio_out_ctx);
     audio_out_ctx = NULL;
 #ifdef HAVE_LIBAVRESAMPLE
     if ( resample_ctx ) {
@@ -621,12 +656,13 @@ Debug(3, "dts:%d, pts:%d, keyframe:%d", pkt.dts, pkt.pts, keyframe );
   }
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   if ( video_in_ctx ) {
-  avcodec_free_context(&video_in_ctx);
-  video_in_ctx = NULL;
+    avcodec_free_context(&video_in_ctx);
+    video_in_ctx = NULL;
   }
   if ( video_out_ctx ) {
-  avcodec_free_context(&video_out_ctx);
-  video_out_ctx = NULL;
+    avcodec_close(video_out_ctx);
+    avcodec_free_context(&video_out_ctx);
+    video_out_ctx = NULL;
   }
 #endif
 
@@ -995,6 +1031,7 @@ int VideoStore::writeVideoFramePacket( ZMPacket * zm_packet ) {
       opkt.dts = opkt.pts = ( zm_packet->timestamp.tv_sec*1000000 + zm_packet->timestamp.tv_usec ) - video_last_pts;
     }
   }
+  opkt.duration = 0;
 
   int keyframe = opkt.flags & AV_PKT_FLAG_KEY;
 Debug(3, "dts:%d, pts:%d, keyframe:%d", opkt.dts, opkt.pts, keyframe );