VM tokenizer: remove a duplicate condition in a long &&-expression

[xonotic/darkplaces.git] / cap_ogg.c

diff --git a/cap_ogg.c b/cap_ogg.c
index 9382bb566ac11d3cef3378a39e337bf625745e61..424eac411774344d2f27fbd731c10c8783aa6dd4 100644 (file)
--- a/cap_ogg.c
+++ b/cap_ogg.c
@@ -521,9 +521,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
 {
        const char* dllnames_og [] =
        {
-#if defined(WIN64)
-               "libogg64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libogg.dll",
                "ogg.dll",
 #elif defined(MACOSX)
@@ -536,9 +534,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        };
        const char* dllnames_vo [] =
        {
-#if defined(WIN64)
-               "libvorbis64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libvorbis.dll",
                "vorbis.dll",
 #elif defined(MACOSX)
@@ -551,9 +547,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        };
        const char* dllnames_ve [] =
        {
-#if defined(WIN64)
-               "libvorbisenc64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libvorbisenc.dll",
                "vorbisenc.dll",
 #elif defined(MACOSX)
@@ -566,9 +560,7 @@ qboolean SCR_CaptureVideo_Ogg_OpenLibrary(void)
        };
        const char* dllnames_th [] =
        {
-#if defined(WIN64)
-               "libtheora64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "libtheora.dll",
                "theora.dll",
 #elif defined(MACOSX)
@@ -1009,13 +1001,13 @@ void SCR_CaptureVideo_Ogg_BeginVideo(void)
                        if(ti.quality < 0)
                        {
                                ti.target_bitrate = -1;
-                               ti.keyframe_data_target_bitrate = -1;
+                               ti.keyframe_data_target_bitrate = (unsigned int)-1;
                                ti.quality = 63;
                        }
                        else
                        {
                                ti.target_bitrate = -1;
-                               ti.keyframe_data_target_bitrate = -1;
+                               ti.keyframe_data_target_bitrate = (unsigned int)-1;
                                ti.quality = bound(0, ti.quality, 63);
                        }
                }