Merge remote-tracking branch 'remotes/xdarkice/gstreamer' into develop

Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

Set GStreamer as default audio decoder
This commit is contained in:
Alexander Eckart committed 2013-02-22 22:29:05 +01:00
commit 69e5537f76
1336 files changed
+155529 -6

No files matched your search

+4 -2
View File
@@ -637,7 +637,8 @@ namespace Vocaluxe.Menu
public enum EPlaybackLib
{
PortAudio,
OpenAL
OpenAL,
Gstreamer
}
public enum EWebcamLib
@@ -656,7 +657,8 @@ namespace Vocaluxe.Menu
public enum EVideoDecoder
{
FFmpeg
FFmpeg,
Gstreamer
}
public enum ESongMenu