From 99d2965e217172bba0fd9545917dd87e03720c62 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Wed, 30 Oct 2013 18:19:52 -0700
Subject: [PATCH] fix a minor warning and make ffmpeg dependencies a little bit
 easier to deal with in VS

---
 libobs/media-io/audio-io.c    | 2 +-
 vs/2010/libobs/libobs.vcxproj | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libobs/media-io/audio-io.c b/libobs/media-io/audio-io.c
index 5aac18bf5..b881ff8bf 100644
--- a/libobs/media-io/audio-io.c
+++ b/libobs/media-io/audio-io.c
@@ -210,7 +210,7 @@ void audio_line_output(audio_line_t line, const struct audio_data *data)
 		position = convert_to_sample_offset(line->audio, position);
 		position *= line->audio->block_size;
 
-		circlebuf_place(&line->buffer, position, data->data,
+		circlebuf_place(&line->buffer, (size_t)position, data->data,
 				data->frames * line->audio->block_size);
 	}
 }
diff --git a/vs/2010/libobs/libobs.vcxproj b/vs/2010/libobs/libobs.vcxproj
index 84cd3926a..be0275284 100644
--- a/vs/2010/libobs/libobs.vcxproj
+++ b/vs/2010/libobs/libobs.vcxproj
@@ -152,22 +152,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(FFmpegPath);$(IncludePath)</IncludePath>
-    <LibraryPath>$(FFmpegPath)\lib32;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(FFmpegPath)\lib32;$(FFmpegPath)\libavcodec;$(FFmpegPath)\libavutil;$(FFmpegPath)\libavformat;$(FFmpegPath)\libswresample;$(FFmpegPath)\libswscale;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(FFmpegPath);$(IncludePath)</IncludePath>
-    <LibraryPath>$(FFmpegPath)\lib64;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(FFmpegPath)\lib64;$(FFmpegPath)\libavcodec;$(FFmpegPath)\libavutil;$(FFmpegPath)\libavformat;$(FFmpegPath)\libswresample;$(FFmpegPath)\libswscale;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(FFmpegPath);$(IncludePath)</IncludePath>
-    <LibraryPath>$(FFmpegPath)\lib32;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(FFmpegPath)\lib32;$(FFmpegPath)\libavcodec;$(FFmpegPath)\libavutil;$(FFmpegPath)\libavformat;$(FFmpegPath)\libswresample;$(FFmpegPath)\libswscale;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(FFmpegPath);$(IncludePath)</IncludePath>
-    <LibraryPath>$(FFmpegPath)\lib64;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(FFmpegPath)\lib64;$(FFmpegPath)\libavcodec;$(FFmpegPath)\libavutil;$(FFmpegPath)\libavformat;$(FFmpegPath)\libswresample;$(FFmpegPath)\libswscale;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>