* modules/codec/x264.c: a couple of fixes + use SSE2 detection.

* modules/codec/ffmpeg/ffmpeg.c: use SSE2 detection.

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index bd36500243c2f2f1743378231c0b1ba93d772561..8d339be08952889de9d4628490e5fe716edca07e 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -240,6 +240,9 @@ static int OpenDecoder( vlc_object_t *p_this )
     if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
     {
         p_context->dsp_mask |= FF_MM_SSE;
+    }
+    if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) )
+    {
         p_context->dsp_mask |= FF_MM_SSE2;
     }
 

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 93d78022be363cf882fde188351c48d17976a3ec..1c2736788b26e911aa8f0571feae7c9d6c04307d 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -146,8 +146,8 @@ vlc_module_end();
  * Local prototypes
  *****************************************************************************/
 static const char *ppsz_sout_options[] = {
-    "qp", "qp-max", "qp-max", "cabac", "loopfilter", "analyse",
-    "keyint", "idrint", "bframes", "frameref", NULL
+    "qp", "qp-min", "qp-max", "cabac", "loopfilter", "analyse",
+    "keyint", "idrint", "bframes", "frameref", "scenecut", NULL
 };
 
 static block_t *Encode( encoder_t *, picture_t * );
@@ -222,6 +222,7 @@ static int  Open ( vlc_object_t *p_this )
     {
         /* No QP -> constant bitrate */
 #if X264_BUILD >= 0x000a
+        p_sys->param.rc.b_cbr = 1;
         p_sys->param.rc.i_bitrate = p_enc->fmt_out.i_bitrate / 1000;
         p_sys->param.rc.i_rc_buffer_size = p_sys->param.rc.i_bitrate;
         p_sys->param.rc.i_rc_init_buffer = p_sys->param.rc.i_bitrate / 4;
@@ -299,7 +300,11 @@ static int  Open ( vlc_object_t *p_this )
     }
     if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
     {
-        p_sys->param.cpu &= ~(X264_CPU_SSE|X264_CPU_SSE2);
+        p_sys->param.cpu &= ~X264_CPU_SSE;
+    }
+    if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) )
+    {
+        p_sys->param.cpu &= ~X264_CPU_SSE2;
     }
 
     /* Open the encoder */