From 4a492ce088422ac77a50d8761c7d9ccf0b019f5a Mon Sep 17 00:00:00 2001
From: SteveGilvarry <steve.gilvarry@gmail.com>
Date: Tue, 2 Dec 2014 21:49:50 +1100
Subject: [PATCH] Fix some issues from the merge conflict

---
 src/zm_ffmpeg_camera.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index b10f885e2..dcf8c5d1a 100755
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -308,7 +308,6 @@ int FfmpegCamera::OpenFfmpeg() {
 			mVideoStreamId = i;
 			break;
 		}
-    }
         if(mAudioStreamId == -1) //FIXME best way to copy all other streams?
         {
 #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
@@ -442,7 +441,6 @@ int FfmpegCamera::FfmpegInterruptCallback(void *ctx)
             Error ( "Open video took more than %d seconds.", config.ffmpeg_open_timeout );
             return 1;
         }
-        av_free_packet( &packet );
     }
 
     return 0;