mft: Link to mfplat when building with msvc

[vlc] / modules / codec / x264.c

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index a5b7a323596f80486cf954f8bf8a59656e2d2257..9ade8973f27288d7a2ce91302189e720a344e8d2 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -441,7 +441,7 @@ static const char *const direct_pred_list[] =
 static const char *const direct_pred_list_text[] =
   { N_("None"), N_("Spatial"), N_("Temporal"), N_("Auto") };
 
-static const int const framepacking_list[] =
+static const int framepacking_list[] =
   { -1, 0, 1, 2, 3, 4, 5 };
 static const char *const framepacking_list_text[] =
   { "", N_("checkerboard"), N_("column alternation"), N_("row alternation"), N_("side by side"), N_("top bottom"), N_("frame alternation") };
@@ -1289,7 +1289,7 @@ static int  Open ( vlc_object_t *p_this )
         p_sys->param.i_fps_num = p_enc->fmt_in.video.i_frame_rate;
         p_sys->param.i_fps_den = p_enc->fmt_in.video.i_frame_rate_base;
         p_sys->param.i_timebase_num = 1;
-        p_sys->param.i_timebase_den = INT64_C(1000000);
+        p_sys->param.i_timebase_den = CLOCK_FREQ;
         p_sys->param.b_vfr_input = 0;
     }
 
@@ -1467,7 +1467,6 @@ static void x264_log( void *data, int i_level, const char *psz, va_list args)
             i_level = VLC_MSG_INFO;
             break;
         case X264_LOG_DEBUG:
-            i_level = VLC_MSG_DBG;
         default:
             i_level = VLC_MSG_DBG;
     }
@@ -1542,7 +1541,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
         p_block->i_flags |= BLOCK_FLAG_TYPE_PB;
 
     /* This isn't really valid for streams with B-frames */
-    p_block->i_length = INT64_C(1000000) *
+    p_block->i_length = CLOCK_FREQ *
         p_enc->fmt_in.video.i_frame_rate_base /
             p_enc->fmt_in.video.i_frame_rate;