celp filters: Do not read earlier than the start of the 'out' vector.

[ffmpeg] / libavcodec / x86 / dnxhd_mmx.c

diff --git a/libavcodec/x86/dnxhd_mmx.c b/libavcodec/x86/dnxhd_mmx.c
index 59bcb3929bf992e6afeeb80b1cdbd283bd70d7b6..e193d62e21630c20ec15c7fe6a747bffc850140e 100644 (file)
--- a/libavcodec/x86/dnxhd_mmx.c
+++ b/libavcodec/x86/dnxhd_mmx.c
@@ -4,20 +4,20 @@
  *
  * VC-3 encoder funded by the British Broadcasting Corporation
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -27,16 +27,16 @@
 static void get_pixels_8x4_sym_sse2(DCTELEM *block, const uint8_t *pixels, int line_size)
 {
     __asm__ volatile(
-        "pxor %%xmm7,      %%xmm7       \n\t"
+        "pxor %%xmm5,      %%xmm5       \n\t"
         "movq (%0),        %%xmm0       \n\t"
         "add  %2,          %0           \n\t"
         "movq (%0),        %%xmm1       \n\t"
         "movq (%0, %2),    %%xmm2       \n\t"
         "movq (%0, %2,2),  %%xmm3       \n\t"
-        "punpcklbw %%xmm7, %%xmm0       \n\t"
-        "punpcklbw %%xmm7, %%xmm1       \n\t"
-        "punpcklbw %%xmm7, %%xmm2       \n\t"
-        "punpcklbw %%xmm7, %%xmm3       \n\t"
+        "punpcklbw %%xmm5, %%xmm0       \n\t"
+        "punpcklbw %%xmm5, %%xmm1       \n\t"
+        "punpcklbw %%xmm5, %%xmm2       \n\t"
+        "punpcklbw %%xmm5, %%xmm3       \n\t"
         "movdqa %%xmm0,      (%1)       \n\t"
         "movdqa %%xmm1,    16(%1)       \n\t"
         "movdqa %%xmm2,    32(%1)       \n\t"
@@ -52,7 +52,8 @@ static void get_pixels_8x4_sym_sse2(DCTELEM *block, const uint8_t *pixels, int l
 
 void ff_dnxhd_init_mmx(DNXHDEncContext *ctx)
 {
-    if (mm_flags & FF_MM_SSE2) {
-        ctx->get_pixels_8x4_sym = get_pixels_8x4_sym_sse2;
+    if (av_get_cpu_flags() & AV_CPU_FLAG_SSE2) {
+        if (ctx->cid_table->bit_depth == 8)
+            ctx->get_pixels_8x4_sym = get_pixels_8x4_sym_sse2;
     }
 }