opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-19 01:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a minor warning and make ffmpeg dependencies a little bit easier to deal with in VS

Browse Source
This commit is contained in:
jp9000
2013-10-30 18:19:52 -07:00
parent 6147446059
commit 99d2965e21
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs/media-io/audio-io.c
+1 -1
View File
@@ -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);
}
}
vs/2010/libobs/libobs.vcxproj
+4 -4
View File
@@ -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>