bring recent improvements in ffmpeg capture function into captureandrecord

src/zm_ffmpeg_camera.cpp

@@ -472,6 +472,24 @@ void *FfmpegCamera::ReopenFfmpegThreadCallback(void *ctx){
 //Function to handle capture and store
 int FfmpegCamera::CaptureAndRecord( Image &image, bool recording, char* event_file )
 {
+    if (!mCanCapture){
+        return -1;
+    }
+    
+    // If the reopen thread has a value, but mCanCapture != 0, then we have just reopened the connection to the ffmpeg device, and we can clean up the thread.
+    if (mReopenThread != 0) {
+        void *retval = 0;
+        int ret;
+        
+        ret = pthread_tryjoin_np(mReopenThread, &retval);
+        if (ret != 0){
+            Error("Could not join reopen thread.");
+        }
+        
+        Info( "Successfully reopened stream." );
+        mReopenThread = 0;
+    }
+
 	AVPacket packet;
 	uint8_t* directbuffer;
    
@@ -488,14 +506,30 @@ int FfmpegCamera::CaptureAndRecord( Image &image, bool recording, char* event_fi
         int avResult = av_read_frame( mFormatContext, &packet );
         if ( avResult < 0 )
         {
-            Error( "Unable to read packet from stream %d: error %d", packet.stream_index, avResult );
+            char errbuf[AV_ERROR_MAX_STRING_SIZE];
-            av_free_packet( &packet );
+            av_strerror(avResult, errbuf, AV_ERROR_MAX_STRING_SIZE);
+            if (
+                // Check if EOF.
+                (avResult == AVERROR_EOF || (mFormatContext->pb && mFormatContext->pb->eof_reached)) ||
+                // Check for Connection failure.
+                (avResult == -110)
+            )
+            {
+                Info( "av_read_frame returned \"%s\". Reopening stream.", errbuf);
+                ReopenFfmpeg();
+            }
+
+            Error( "Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, avResult, errbuf );
             return( -1 );
         }
         Debug( 5, "Got packet from stream %d", packet.stream_index );
         if ( packet.stream_index == mVideoStreamId )
         {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 25, 0)
 			if ( avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet ) < 0 )
+#else
+			if ( avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size ) < 0 )
+#endif
                 Fatal( "Unable to decode frame at frame %d", frameCount );
 
             Debug( 4, "Decoded video packet at frame %d", frameCount );