Merge commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314'

* commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314':
  fdct: Move x86-specific declarations to a header in the x86 directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dct-test.c
Simple merge

diff --cc libavcodec/dct.h
index a500521dce9a8a65c617f760bbeea09e455ccf81,3fd4e278334fc87e256fbd7569fba291d2cce695..9238449db3ec275fd3073dfd7c66aaeb57286b7b
--- 1/libavcodec/dct.h
--- 2/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@@ -59,12 -59,5 +59,8 @@@ void ff_fdct248_islow_8(int16_t *data)
  void ff_fdct248_islow_10(int16_t *data);
  
  void ff_j_rev_dct(int16_t *data);
 +void ff_j_rev_dct4(int16_t *data);
 +void ff_j_rev_dct2(int16_t *data);
 +void ff_j_rev_dct1(int16_t *data);
  
- void ff_fdct_mmx(int16_t *block);
- void ff_fdct_mmxext(int16_t *block);
- void ff_fdct_sse2(int16_t *block);
- 
  #endif /* AVCODEC_DCT_H */

diff --cc libavcodec/x86/fdct.c
Simple merge

diff --cc libavcodec/x86/fdct.h
index 0000000000000000000000000000000000000000,c94a977e8f84fa6a191be8250663e49229463e44..648cdc5350f401ae41ae2645f73405377c1331a5
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/x86/fdct.h
+++ b/libavcodec/x86/fdct.h
@@@ -1,0 -1,28 +1,28 @@@
 - * 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_FDCT_H
+ #define AVCODEC_X86_FDCT_H
+ 
+ #include <stdint.h>
+ 
+ void ff_fdct_mmx(int16_t *block);
+ void ff_fdct_mmxext(int16_t *block);
+ void ff_fdct_sse2(int16_t *block);
+ 
+ #endif /* AVCODEC_X86_FDCT_H */

diff --cc libavcodec/x86/fdctdsp_init.c
Simple merge

diff --cc libavcodec/x86/mpegvideoenc_template.c
Simple merge