Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:02:46 +0000 (23:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:08:22 +0000 (23:08 +0100)
* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
  x86: dsputil: Move fpel declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/cavsdsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/fpel.h
libavcodec/x86/fpel_mmx.c
libavcodec/x86/h264_qpel.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/vc1dsp_mmx.c

Simple merge
Simple merge
   */
  
  #include "config.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/cpu.h"
  #include "libavutil/x86/asm.h"
 +#include "libavcodec/pixels.h"
 +#include "libavcodec/videodsp.h"
  #include "constants.h"
 +#include "diracdsp_mmx.h"
  #include "dsputil_x86.h"
++#include "fpel.h"
  #include "inline_asm.h"
  
  #if HAVE_INLINE_ASM
Simple merge
index 0000000,88d1415..2fbbfce
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,43 +1,43 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg 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
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ #ifndef AVCODEC_X86_FPEL_H
+ #define AVCODEC_X86_FPEL_H
+ #include <stddef.h>
+ #include <stdint.h>
+ void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
+                         ptrdiff_t line_size, int h);
+ void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels,
+                            ptrdiff_t line_size, int h);
+ void ff_avg_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
+                          ptrdiff_t line_size, int h);
+ void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
+                           ptrdiff_t line_size, int h);
+ void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
+                         ptrdiff_t line_size, int h);
+ void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels,
+                            ptrdiff_t line_size, int h);
+ void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
+                          ptrdiff_t line_size, int h);
+ void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
+                           ptrdiff_t line_size, int h);
+ #endif /* AVCODEC_X86_FPEL_H */
Simple merge
Simple merge
Simple merge
Simple merge