diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
index 32a216231..473bc4409 100644
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@@ -428,97 +428,95 @@ int RemoteCameraRtsp::CaptureAndRecord( Image &image, bool recording, char* even
       // Why are we checking for it being the video stream
       if ( packet.stream_index == mVideoStreamId ) {
 
-    while ( !frameComplete && buffer.size() > 0 )
-    {
-      packet.data = buffer.head();
-      packet.size = buffer.size();
+        while ( !frameComplete && buffer.size() > 0 ) {
+          packet.data = buffer.head();
+          packet.size = buffer.size();
 
-        // So this does the decode
+          // So this does the decode
 #if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
-      int len = avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet );
+          int len = avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet );
 #else
-      int len = avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size );
+          int len = avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size );
 #endif
-      if ( len < 0 )
-      {
-        Error( "Error while decoding frame %d", frameCount );
-        Hexdump( Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size() );
-        buffer.clear();
-        continue;
-      }
-      Debug( 2, "Frame: %d - %d/%d", frameCount, len, buffer.size() );
-      //if ( buffer.size() < 400 )
-         //Hexdump( 0, buffer.head(), buffer.size() );
-       
-      buffer -= len;
-    } // end while get & decode a frame
+          if ( len < 0 ) {
+            Error( "Error while decoding frame %d", frameCount );
+            Hexdump( Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size() );
+            buffer.clear();
+            continue;
+          }
+          Debug( 2, "Frame: %d - %d/%d", frameCount, len, buffer.size() );
+          //if ( buffer.size() < 400 )
+          //Hexdump( 0, buffer.head(), buffer.size() );
+
+          buffer -= len;
+        } // end while get & decode a frame
+
+        if ( frameComplete ) {
+
+          Debug( 3, "Got frame %d", frameCount );
 
-    if ( frameComplete ) {
-       
-      Debug( 3, "Got frame %d", frameCount );
-        
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-      av_image_fill_arrays(mFrame->data, mFrame->linesize,
-        directbuffer, imagePixFormat, width, height, 1);
+          av_image_fill_arrays(mFrame->data, mFrame->linesize,
+              directbuffer, imagePixFormat, width, height, 1);
 #else
-      avpicture_fill( (AVPicture *)mFrame, directbuffer,
-        imagePixFormat, width, height);
+          avpicture_fill( (AVPicture *)mFrame, directbuffer,
+              imagePixFormat, width, height);
 #endif
-      
-      //Video recording
-      if ( recording && !wasRecording ) {
-        //Instantiate the video storage module
 
-        videoStore = new VideoStore((const char *)event_file, "mp4", mFormatContext->streams[mVideoStreamId],mAudioStreamId==-1?NULL:mFormatContext->streams[mAudioStreamId],startTime);
-        wasRecording = true;
-        strcpy(oldDirectory, event_file);
+          //Video recording
+          if ( recording && !wasRecording ) {
+            //Instantiate the video storage module
 
-      } else if ( !recording && wasRecording && videoStore ) {
-        // Why are we deleting the videostore? Becase for soem reason we are no longer recording? How does that happen?
-        Info("Deleting videoStore instance");
-        delete videoStore;
-        videoStore = NULL;
-      }
+            videoStore = new VideoStore((const char *)event_file, "mp4", mFormatContext->streams[mVideoStreamId],mAudioStreamId==-1?NULL:mFormatContext->streams[mAudioStreamId],startTime);
+            wasRecording = true;
+            strcpy(oldDirectory, event_file);
 
-      //The directory we are recording to is no longer tied to the current event. Need to re-init the videostore with the correct directory and start recording again
-      if ( recording && wasRecording && (strcmp(oldDirectory, event_file)!=0) && (packet.flags & AV_PKT_FLAG_KEY) ) {
-        //don't open new videostore until we're on a key frame..would this require an offset adjustment for the event as a result?...if we store our key frame location with the event will that be enough?
-        Info("Re-starting video storage module");
-        if ( videoStore ) {
-          delete videoStore;
-          videoStore = NULL;
-        }
+          } else if ( !recording && wasRecording && videoStore ) {
+            // Why are we deleting the videostore? Becase for soem reason we are no longer recording? How does that happen?
+            Info("Deleting videoStore instance");
+            delete videoStore;
+            videoStore = NULL;
+          }
 
-      videoStore = new VideoStore((const char *)event_file, "mp4", mFormatContext->streams[mVideoStreamId],mAudioStreamId==-1?NULL:mFormatContext->streams[mAudioStreamId],startTime);
-      strcpy( oldDirectory, event_file );
-      }
+          //The directory we are recording to is no longer tied to the current event. Need to re-init the videostore with the correct directory and start recording again
+          if ( recording && wasRecording && (strcmp(oldDirectory, event_file)!=0) && (packet.flags & AV_PKT_FLAG_KEY) ) {
+            //don't open new videostore until we're on a key frame..would this require an offset adjustment for the event as a result?...if we store our key frame location with the event will that be enough?
+            Info("Re-starting video storage module");
+            if ( videoStore ) {
+              delete videoStore;
+              videoStore = NULL;
+            }
 
-      if ( videoStore && recording ) {
-        //Write the packet to our video store
-        int ret = videoStore->writeVideoFramePacket(&packet, mFormatContext->streams[mVideoStreamId]);//, &lastKeyframePkt);
-        if ( ret < 0 ) {//Less than zero and we skipped a frame
-          av_free_packet( &packet );
-          return 0;
-        }
-      }
+            videoStore = new VideoStore((const char *)event_file, "mp4", mFormatContext->streams[mVideoStreamId],mAudioStreamId==-1?NULL:mFormatContext->streams[mAudioStreamId],startTime);
+            strcpy( oldDirectory, event_file );
+          }
+
+          if ( videoStore && recording ) {
+            //Write the packet to our video store
+            int ret = videoStore->writeVideoFramePacket(&packet, mFormatContext->streams[mVideoStreamId]);//, &lastKeyframePkt);
+            if ( ret < 0 ) {//Less than zero and we skipped a frame
+              av_free_packet( &packet );
+              return 0;
+            }
+          }
 
 #if HAVE_LIBSWSCALE
-      if(mConvertContext == NULL) {
-        mConvertContext = sws_getContext( mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );
+          if(mConvertContext == NULL) {
+            mConvertContext = sws_getContext( mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );
 
-        if(mConvertContext == NULL)
-          Fatal( "Unable to create conversion context");
-      }
-  
-      if ( sws_scale( mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize ) < 0 )
-        Fatal( "Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount );
+            if(mConvertContext == NULL)
+              Fatal( "Unable to create conversion context");
+          }
+
+          if ( sws_scale( mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize ) < 0 )
+            Fatal( "Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount );
 #else // HAVE_LIBSWSCALE
-      Fatal( "You must compile ffmpeg with the --enable-swscale option to use RTSP cameras" );
+          Fatal( "You must compile ffmpeg with the --enable-swscale option to use RTSP cameras" );
 #endif // HAVE_LIBSWSCALE
-  
-      frameCount++;
 
-    } /* frame complete */
+          frameCount++;
+
+        } /* frame complete */
       } else if ( packet.stream_index == mAudioStreamId ) {
         Debug( 4, "Got audio packet" );
         if ( videoStore && recording ) {
@@ -534,7 +532,6 @@ int RemoteCameraRtsp::CaptureAndRecord( Image &image, bool recording, char* even
 #endif
               return 0;
             }
-          } else {
         }
       } // end if video or audio packet