diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index b52f5ea2b..f55dcaabd 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -29,7 +29,7 @@
 #include "zm_videostore.h"
 
 extern "C"{
-#include "libavutil/time.h"
+  #include "libavutil/time.h"
 }
 
 VideoStore::VideoStore(const char *filename_in, const char *format_in,
@@ -37,313 +37,313 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
                        AVStream *inpaud_st,
                        int64_t nStartTime) {
     
-	AVDictionary *pmetadata = NULL;
-	int dsr;
+  AVDictionary *pmetadata = NULL;
+  int dsr;
 
-    //store inputs in variables local to class
-    filename = filename_in;
-    format = format_in;
-    
-    keyframeMessage = false;
-    keyframeSkipNumber = 0;
+  //store inputs in variables local to class
+  filename = filename_in;
+  format = format_in;
 
-    Info("Opening video storage stream %s format: %d\n", filename, format);
+  keyframeMessage = false;
+  keyframeSkipNumber = 0;
 
-    //Init everything we need
-    int ret;
-    av_register_all();
+  Info("Opening video storage stream %s format: %d\n", filename, format);
 
-    ret = avformat_alloc_output_context2(&oc, NULL, NULL, filename);
-    if ( ret < 0 ) {
-            Warning("Could not create video storage stream %s as no output context"
-                  " could be assigned based on filename: %s",
-                    filename,
-                    av_make_error_string(ret).c_str()
-                   );
-    }
-        
-    //Couldn't deduce format from filename, trying from format name
+  //Init everything we need
+  int ret;
+  av_register_all();
+
+  ret = avformat_alloc_output_context2(&oc, NULL, NULL, filename);
+  if ( ret < 0 ) {
+    Warning("Could not create video storage stream %s as no output context"
+        " could be assigned based on filename: %s",
+        filename,
+        av_make_error_string(ret).c_str()
+        );
+  }
+
+  //Couldn't deduce format from filename, trying from format name
+  if (!oc) {
+    avformat_alloc_output_context2(&oc, NULL, format, filename);
     if (!oc) {
-        avformat_alloc_output_context2(&oc, NULL, format, filename);
-        if (!oc) {
-            Fatal("Could not create video storage stream %s as no output context"
-                  " could not be assigned based on filename or format %s",
-                    filename, format);
-        }
+      Fatal("Could not create video storage stream %s as no output context"
+          " could not be assigned based on filename or format %s",
+          filename, format);
     }
+  }
 
-	dsr = av_dict_set(&pmetadata, "title", "Zoneminder Security Recording", 0);
-	if (dsr < 0) Warning("%s:%d: title set failed", __FILE__, __LINE__ );
+  dsr = av_dict_set(&pmetadata, "title", "Zoneminder Security Recording", 0);
+  if (dsr < 0) Warning("%s:%d: title set failed", __FILE__, __LINE__ );
 
-	oc->metadata = pmetadata;
-        
-    fmt = oc->oformat;
-    
-	video_st = avformat_new_stream(oc, (AVCodec *)input_st->codec->codec);
-    if (!video_st) {
-        Fatal("Unable to create video out stream\n");
-    }
-    
-    ret = avcodec_copy_context(video_st->codec, input_st->codec);
-    if (ret < 0) { 
-        Fatal("Unable to copy input video context to output video context "
-              "%s\n", av_make_error_string(ret).c_str());
-        }
+  oc->metadata = pmetadata;
 
-    video_st->codec->codec_tag = 0;
-    if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
-        video_st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-    }
-    
-    if (inpaud_st) {
+  fmt = oc->oformat;
 
-        audio_st = avformat_new_stream(oc, (AVCodec *)inpaud_st->codec->codec);
-        if (!audio_st) {
-            Error("Unable to create audio out stream\n");
-            audio_st = NULL;
-        } else {
-            ret = avcodec_copy_context(audio_st->codec, inpaud_st->codec);
-            if (ret < 0) {
-                Fatal("Unable to copy audio context %s\n", av_make_error_string(ret).c_str());
-            }   
-            audio_st->codec->codec_tag = 0;
-            if ( audio_st->codec->channels > 1 ) {
-                Warning("Audio isn't mono, changing it.");
-                audio_st->codec->channels = 1;
-            }
-            if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
-                audio_st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-            }
-        }
+  video_st = avformat_new_stream(oc, (AVCodec *)input_st->codec->codec);
+  if (!video_st) {
+    Fatal("Unable to create video out stream\n");
+  }
+
+  ret = avcodec_copy_context(video_st->codec, input_st->codec);
+  if (ret < 0) { 
+    Fatal("Unable to copy input video context to output video context %s\n", 
+        av_make_error_string(ret).c_str());
+  }
+
+  video_st->codec->codec_tag = 0;
+  if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
+    video_st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+  }
+
+  if (inpaud_st) {
+
+    audio_st = avformat_new_stream(oc, (AVCodec *)inpaud_st->codec->codec);
+    if (!audio_st) {
+      Error("Unable to create audio out stream\n");
+      audio_st = NULL;
     } else {
-        Debug(3, "No Audio output stream");
-        audio_st = NULL;
-    }    
-
-    /* open the output file, if needed */
-    if (!(fmt->flags & AVFMT_NOFILE)) {
-        ret = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE,NULL,NULL);
-        if (ret < 0) {
-            Fatal("Could not open output file '%s': %s\n", filename,
-                    av_make_error_string(ret).c_str());
-        }
+      ret = avcodec_copy_context(audio_st->codec, inpaud_st->codec);
+      if (ret < 0) {
+        Fatal("Unable to copy audio context %s\n", av_make_error_string(ret).c_str());
+      }   
+      audio_st->codec->codec_tag = 0;
+      if ( audio_st->codec->channels > 1 ) {
+        Warning("Audio isn't mono, changing it.");
+        audio_st->codec->channels = 1;
+      }
+      if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
+        audio_st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+      }
     }
+  } else {
+    Debug(3, "No Audio output stream");
+    audio_st = NULL;
+  }    
 
- //av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
-           //if ((ret = avformat_write_header(ctx, &opts)) < 0) {
-           //}
-           //os->ctx_inited = 1;
-           //avio_flush(ctx->pb);
-           //av_dict_free(&opts);
-
-    /* Write the stream header, if any. */
-    ret = avformat_write_header(oc, NULL);
+  /* open the output file, if needed */
+  if (!(fmt->flags & AVFMT_NOFILE)) {
+    ret = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE,NULL,NULL);
     if (ret < 0) {
-        zm_dump_stream_format( oc, 0, 0, 1 );
-        Fatal("Error occurred when writing output file header to %s: %s\n",
-                    filename,
-                    av_make_error_string(ret).c_str());
+      Fatal("Could not open output file '%s': %s\n", filename,
+          av_make_error_string(ret).c_str());
     }
-    
-	prevDts = 0;
-    startPts = 0;
-    startDts = 0;
-    filter_in_rescale_delta_last = AV_NOPTS_VALUE;
+  }
 
-    startTime=av_gettime()-nStartTime;//oc->start_time;
-    Info("VideoStore startTime=%d\n",startTime);
+  //av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
+  //if ((ret = avformat_write_header(ctx, &opts)) < 0) {
+  //}
+  //os->ctx_inited = 1;
+  //avio_flush(ctx->pb);
+  //av_dict_free(&opts);
+
+  /* Write the stream header, if any. */
+  ret = avformat_write_header(oc, NULL);
+  if (ret < 0) {
+    zm_dump_stream_format( oc, 0, 0, 1 );
+    Fatal("Error occurred when writing output file header to %s: %s\n",
+        filename,
+        av_make_error_string(ret).c_str());
+  }
+
+  prevDts = 0;
+  startPts = 0;
+  startDts = 0;
+  filter_in_rescale_delta_last = AV_NOPTS_VALUE;
+
+  startTime=av_gettime()-nStartTime;//oc->start_time;
+  Info("VideoStore startTime=%d\n",startTime);
 } // VideoStore::VideoStore
 
 
 VideoStore::~VideoStore(){
-    /* Write the trailer before close */
-    if ( int rc = av_write_trailer(oc) ) {
-        Error("Error writing trailer %s",  av_err2str( rc ) );
-    } else {
-        Debug(3, "Sucess Writing trailer");
-    }
-    
-    // I wonder if we should be closing the file first.
-    // I also wonder if we really need to be doing all the context 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_st ) {
-        avcodec_close(video_st->codec);
-    }
-    if (audio_st) {
-        avcodec_close(audio_st->codec);
-    }
-    
-    // WHen will be not using a file ?
-    if (!(fmt->flags & AVFMT_NOFILE)) {
-    /* Close the output file. */
-        if ( int rc = avio_close(oc->pb) ) {
-            Error("Error closing avio %s",  av_err2str( rc ) );
-        }
-    } else {
-        Debug(3, "Not closing avio because we are not writing to a file.");
-    }
+  /* Write the trailer before close */
+  if ( int rc = av_write_trailer(oc) ) {
+    Error("Error writing trailer %s",  av_err2str( rc ) );
+  } else {
+    Debug(3, "Sucess Writing trailer");
+  }
 
-    /* free the stream */
-    avformat_free_context(oc);
+  // I wonder if we should be closing the file first.
+  // I also wonder if we really need to be doing all the context 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_st ) {
+    avcodec_close(video_st->codec);
+  }
+  if (audio_st) {
+    avcodec_close(audio_st->codec);
+  }
+
+  // WHen will be not using a file ?
+  if (!(fmt->flags & AVFMT_NOFILE)) {
+    /* Close the output file. */
+    if ( int rc = avio_close(oc->pb) ) {
+      Error("Error closing avio %s",  av_err2str( rc ) );
+    }
+  } else {
+    Debug(3, "Not closing avio because we are not writing to a file.");
+  }
+
+  /* free the stream */
+  avformat_free_context(oc);
 }
 
 
 void VideoStore::dumpPacket( AVPacket *pkt ){
-	char b[10240];
+  char b[10240];
 
-	snprintf(b, sizeof(b), " pts: %" PRId64 ", dts: %" PRId64 ", data: %p, size: %d, sindex: %d, dflags: %04x, s-pos: %" PRId64 ", c-duration: %" PRId64 "\n"
-			, pkt->pts
-			, pkt->dts
-			, pkt->data
-			, pkt->size
-			, pkt->stream_index
-			, pkt->flags
-			, pkt->pos
-			, pkt->convergence_duration
-			);
-	Info("%s:%d:DEBUG: %s", __FILE__, __LINE__, b);
+  snprintf(b, sizeof(b), " pts: %" PRId64 ", dts: %" PRId64 ", data: %p, size: %d, sindex: %d, dflags: %04x, s-pos: %" PRId64 ", c-duration: %" PRId64 "\n"
+      , pkt->pts
+      , pkt->dts
+      , pkt->data
+      , pkt->size
+      , pkt->stream_index
+      , pkt->flags
+      , pkt->pos
+      , pkt->convergence_duration
+      );
+  Info("%s:%d:DEBUG: %s", __FILE__, __LINE__, b);
 }
 
 int VideoStore::writeVideoFramePacket(AVPacket *ipkt, AVStream *input_st){//, AVPacket *lastKeyframePkt){
 
-    int64_t ost_tb_start_time = av_rescale_q(startTime, AV_TIME_BASE_Q, video_st->time_base);
-     
-    AVPacket opkt, safepkt;
-    AVPicture pict;
-    
-    av_init_packet(&opkt);
+  int64_t ost_tb_start_time = av_rescale_q(startTime, AV_TIME_BASE_Q, video_st->time_base);
 
-    //Scale the PTS of the outgoing packet to be the correct time base
-    if (ipkt->pts != AV_NOPTS_VALUE) {
-        opkt.pts = av_rescale_q(ipkt->pts-startPts, input_st->time_base, video_st->time_base) - ost_tb_start_time;
-	 } else {
-        opkt.pts = AV_NOPTS_VALUE;
-	 }
-    
-    //Scale the DTS of the outgoing packet to be the correct time base
-    if(ipkt->dts == AV_NOPTS_VALUE) {
-        opkt.dts = av_rescale_q(input_st->cur_dts-startDts, AV_TIME_BASE_Q, video_st->time_base);
-	 } else {
-        opkt.dts = av_rescale_q(ipkt->dts-startDts, input_st->time_base, video_st->time_base);
-	 }
+  AVPacket opkt, safepkt;
+  AVPicture pict;
 
-    opkt.dts -= ost_tb_start_time;
+  av_init_packet(&opkt);
 
-    opkt.duration = av_rescale_q(ipkt->duration, input_st->time_base, video_st->time_base);
-    opkt.flags = ipkt->flags;
-    opkt.pos=-1;
+  //Scale the PTS of the outgoing packet to be the correct time base
+  if (ipkt->pts != AV_NOPTS_VALUE) {
+    opkt.pts = av_rescale_q(ipkt->pts-startPts, input_st->time_base, video_st->time_base) - ost_tb_start_time;
+  } else {
+    opkt.pts = AV_NOPTS_VALUE;
+  }
 
-    opkt.data = ipkt->data;
-    opkt.size = ipkt->size;
-    opkt.stream_index = ipkt->stream_index;
-    /*opkt.flags |= AV_PKT_FLAG_KEY;*/
-    
-    if (video_st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (fmt->flags & AVFMT_RAWPICTURE)) {
-        /* store AVPicture in AVPacket, as expected by the output format */
-        avpicture_fill(&pict, opkt.data, video_st->codec->pix_fmt, video_st->codec->width, video_st->codec->height);
-        opkt.data = (uint8_t *)&pict;
-        opkt.size = sizeof(AVPicture);
-        opkt.flags |= AV_PKT_FLAG_KEY;
+  //Scale the DTS of the outgoing packet to be the correct time base
+  if(ipkt->dts == AV_NOPTS_VALUE) {
+    opkt.dts = av_rescale_q(input_st->cur_dts-startDts, AV_TIME_BASE_Q, video_st->time_base);
+  } else {
+    opkt.dts = av_rescale_q(ipkt->dts-startDts, input_st->time_base, video_st->time_base);
+  }
+
+  opkt.dts -= ost_tb_start_time;
+
+  opkt.duration = av_rescale_q(ipkt->duration, input_st->time_base, video_st->time_base);
+  opkt.flags = ipkt->flags;
+  opkt.pos=-1;
+
+  opkt.data = ipkt->data;
+  opkt.size = ipkt->size;
+  opkt.stream_index = ipkt->stream_index;
+  /*opkt.flags |= AV_PKT_FLAG_KEY;*/
+
+  if (video_st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (fmt->flags & AVFMT_RAWPICTURE)) {
+    /* store AVPicture in AVPacket, as expected by the output format */
+    avpicture_fill(&pict, opkt.data, video_st->codec->pix_fmt, video_st->codec->width, video_st->codec->height);
+    opkt.data = (uint8_t *)&pict;
+    opkt.size = sizeof(AVPicture);
+    opkt.flags |= AV_PKT_FLAG_KEY;
+  }
+
+  memcpy(&safepkt, &opkt, sizeof(AVPacket));
+
+  if ((opkt.data == NULL)||(opkt.size < 1)) {
+    Warning("%s:%d: Mangled AVPacket: discarding frame", __FILE__, __LINE__ ); 
+    dumpPacket(&opkt);
+
+  } else if ((prevDts > 0) && (prevDts >= opkt.dts)) {
+    Warning("%s:%d: DTS out of order: %lld \u226E %lld; discarding frame", __FILE__, __LINE__, prevDts, opkt.dts); 
+    prevDts = opkt.dts; 
+    dumpPacket(&opkt);
+
+  } else {
+    int ret;
+
+    prevDts = opkt.dts; // Unsure if av_interleaved_write_frame() clobbers opkt.dts when out of order, so storing in advance
+    ret = av_interleaved_write_frame(oc, &opkt);
+    if(ret<0){
+      // There's nothing we can really do if the frame is rejected, just drop it and get on with the next
+      Warning("%s:%d: Writing frame [av_interleaved_write_frame()] failed: %s(%d)  ", __FILE__, __LINE__,  av_make_error_string(ret).c_str(), (ret));
+      dumpPacket(&safepkt);
     }
-	  
-	 memcpy(&safepkt, &opkt, sizeof(AVPacket));
-    
-	 if ((opkt.data == NULL)||(opkt.size < 1)) {
-		Warning("%s:%d: Mangled AVPacket: discarding frame", __FILE__, __LINE__ ); 
-		 dumpPacket(&opkt);
-
-	 } else if ((prevDts > 0) && (prevDts >= opkt.dts)) {
-		Warning("%s:%d: DTS out of order: %lld \u226E %lld; discarding frame", __FILE__, __LINE__, prevDts, opkt.dts); 
-		prevDts = opkt.dts; 
-		dumpPacket(&opkt);
-
-	 } else {
-		int ret;
-
-		prevDts = opkt.dts; // Unsure if av_interleaved_write_frame() clobbers opkt.dts when out of order, so storing in advance
-		ret = av_interleaved_write_frame(oc, &opkt);
-		if(ret<0){
-			// There's nothing we can really do if the frame is rejected, just drop it and get on with the next
-        Warning("%s:%d: Writing frame [av_interleaved_write_frame()] failed: %s(%d)  ", __FILE__, __LINE__,  av_make_error_string(ret).c_str(), (ret));
-		  dumpPacket(&safepkt);
-		}
-	 }
+  }
 
 
-    av_free_packet(&opkt); 
+  av_free_packet(&opkt); 
+
+  return 0;
 
-    return 0;
-    
 }
 
 int VideoStore::writeAudioFramePacket(AVPacket *ipkt, AVStream *input_st){
 
-    if(!audio_st) {
-        Error("Called writeAudioFramePacket when no audio_st");
-        return -1;//FIXME -ve return codes do not free packet in ffmpeg_camera at the moment
-    }
-    /*if(!keyframeMessage)
-        return -1;*/
-    //zm_dump_stream_format( oc, ipkt->stream_index, 0, 1 );
-         
-    // What is this doing?  Getting the time of the start of this video chunk? Does that actually make sense?
-    int64_t ost_tb_start_time = av_rescale_q(startTime, AV_TIME_BASE_Q, audio_st->time_base);
-        
-    AVPacket opkt;
-    
-    av_init_packet(&opkt);
-    Debug(3, "after init packet" );
+  if(!audio_st) {
+    Error("Called writeAudioFramePacket when no audio_st");
+    return -1;//FIXME -ve return codes do not free packet in ffmpeg_camera at the moment
+  }
+  /*if(!keyframeMessage)
+    return -1;*/
+  //zm_dump_stream_format( oc, ipkt->stream_index, 0, 1 );
 
-    
-    //Scale the PTS of the outgoing packet to be the correct time base
-    if (ipkt->pts != AV_NOPTS_VALUE) {
-        Debug(3, "Rescaling output pts");
-        opkt.pts = av_rescale_q(ipkt->pts-startPts, input_st->time_base, audio_st->time_base) - ost_tb_start_time;
-    } else {
-        Debug(3, "Setting output pts to AV_NOPTS_VALUE");
-        opkt.pts = AV_NOPTS_VALUE;
-    }
-    
-    //Scale the DTS of the outgoing packet to be the correct time base
-    if(ipkt->dts == AV_NOPTS_VALUE) {
-Debug(4, "ipkt->dts == AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
-        opkt.dts = av_rescale_q(input_st->cur_dts-startDts, AV_TIME_BASE_Q, audio_st->time_base);
-Debug(4, "ipkt->dts == AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
-    } else {
-Debug(4, "ipkt->dts != AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
-        opkt.dts = av_rescale_q(ipkt->dts-startDts, input_st->time_base, audio_st->time_base);
-Debug(4, "ipkt->dts != AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
-    }
-    opkt.dts -= ost_tb_start_time;
-    
-    // Seems like it would be really weird for the codec type to NOT be audiu
-    if (audio_st->codec->codec_type == AVMEDIA_TYPE_AUDIO && ipkt->dts != AV_NOPTS_VALUE) {
-        Debug( 4, "code is audio, dts != AV_NOPTS_VALUE " );
-         int duration = av_get_audio_frame_duration(input_st->codec, ipkt->size);
-         if(!duration)
-             duration = input_st->codec->frame_size;
-             
-        //FIXME where to get filter_in_rescale_delta_last
-		//FIXME av_rescale_delta doesn't exist in ubuntu vivid libavtools
-        opkt.dts = opkt.pts = av_rescale_delta(input_st->time_base, ipkt->dts,
-                                                (AVRational){1, input_st->codec->sample_rate}, duration, &filter_in_rescale_delta_last,
-                                                audio_st->time_base) - ost_tb_start_time;
-    }
-    
-    opkt.duration = av_rescale_q(ipkt->duration, input_st->time_base, audio_st->time_base);
-    opkt.pos=-1;
-    opkt.flags = ipkt->flags;
-    
-    opkt.data = ipkt->data;
-    opkt.size = ipkt->size;
-    opkt.stream_index = ipkt->stream_index;
-        
-    int ret;
-    ret = av_interleaved_write_frame(oc, &opkt);
-    if(ret!=0){
-        Fatal("Error encoding audio frame packet: %s\n", av_make_error_string(ret).c_str());
-    }
-    Debug(4,"Success writing audio frame" ); 
-    av_free_packet(&opkt);
-    return 0;
+  // What is this doing?  Getting the time of the start of this video chunk? Does that actually make sense?
+  int64_t ost_tb_start_time = av_rescale_q(startTime, AV_TIME_BASE_Q, audio_st->time_base);
+
+  AVPacket opkt;
+
+  av_init_packet(&opkt);
+  Debug(3, "after init packet" );
+
+
+  //Scale the PTS of the outgoing packet to be the correct time base
+  if (ipkt->pts != AV_NOPTS_VALUE) {
+    Debug(3, "Rescaling output pts");
+    opkt.pts = av_rescale_q(ipkt->pts-startPts, input_st->time_base, audio_st->time_base) - ost_tb_start_time;
+  } else {
+    Debug(3, "Setting output pts to AV_NOPTS_VALUE");
+    opkt.pts = AV_NOPTS_VALUE;
+  }
+
+  //Scale the DTS of the outgoing packet to be the correct time base
+  if(ipkt->dts == AV_NOPTS_VALUE) {
+    Debug(4, "ipkt->dts == AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
+    opkt.dts = av_rescale_q(input_st->cur_dts-startDts, AV_TIME_BASE_Q, audio_st->time_base);
+    Debug(4, "ipkt->dts == AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
+  } else {
+    Debug(4, "ipkt->dts != AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
+    opkt.dts = av_rescale_q(ipkt->dts-startDts, input_st->time_base, audio_st->time_base);
+    Debug(4, "ipkt->dts != AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
+  }
+  opkt.dts -= ost_tb_start_time;
+
+  // Seems like it would be really weird for the codec type to NOT be audiu
+  if (audio_st->codec->codec_type == AVMEDIA_TYPE_AUDIO && ipkt->dts != AV_NOPTS_VALUE) {
+    Debug( 4, "code is audio, dts != AV_NOPTS_VALUE " );
+    int duration = av_get_audio_frame_duration(input_st->codec, ipkt->size);
+    if(!duration)
+      duration = input_st->codec->frame_size;
+
+    //FIXME where to get filter_in_rescale_delta_last
+    //FIXME av_rescale_delta doesn't exist in ubuntu vivid libavtools
+    opkt.dts = opkt.pts = av_rescale_delta(input_st->time_base, ipkt->dts,
+        (AVRational){1, input_st->codec->sample_rate}, duration, &filter_in_rescale_delta_last,
+        audio_st->time_base) - ost_tb_start_time;
+  }
+
+  opkt.duration = av_rescale_q(ipkt->duration, input_st->time_base, audio_st->time_base);
+  opkt.pos=-1;
+  opkt.flags = ipkt->flags;
+
+  opkt.data = ipkt->data;
+  opkt.size = ipkt->size;
+  opkt.stream_index = ipkt->stream_index;
+
+  int ret;
+  ret = av_interleaved_write_frame(oc, &opkt);
+  if(ret!=0){
+    Fatal("Error encoding audio frame packet: %s\n", av_make_error_string(ret).c_str());
+  }
+  Debug(4,"Success writing audio frame" ); 
+  av_free_packet(&opkt);
+  return 0;
 }