Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'

* commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755':
  idct: Move arm-specific declarations to a header in the arm directory

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

diff --cc libavcodec/arm/idct.h
index 0000000000000000000000000000000000000000,168d64b6664dac02c912497272d707459a5cd02d..39cef3a87460b9ca4559aae94f3932041939ea58
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/arm/idct.h
+++ b/libavcodec/arm/idct.h
@@@ -1,0 -1,40 +1,40 @@@
 - * 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_ARM_IDCT_H
+ #define AVCODEC_ARM_IDCT_H
+ 
+ #include <stdint.h>
+ 
+ void ff_j_rev_dct_arm(int16_t *data);
+ 
+ void ff_simple_idct_arm(int16_t *data);
+ 
+ void ff_simple_idct_armv5te(int16_t *data);
+ void ff_simple_idct_put_armv5te(uint8_t *dest, int line_size, int16_t *data);
+ void ff_simple_idct_add_armv5te(uint8_t *dest, int line_size, int16_t *data);
+ 
+ void ff_simple_idct_armv6(int16_t *data);
+ void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, int16_t *data);
+ void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, int16_t *data);
+ 
+ void ff_simple_idct_neon(int16_t *data);
+ void ff_simple_idct_put_neon(uint8_t *dest, int line_size, int16_t *data);
+ void ff_simple_idct_add_neon(uint8_t *dest, int line_size, int16_t *data);
+ 
+ #endif /* AVCODEC_ARM_IDCT_H */

diff --cc libavcodec/arm/idctdsp_init_arm.c
Simple merge

diff --cc libavcodec/arm/idctdsp_init_armv5te.c
Simple merge

diff --cc libavcodec/arm/idctdsp_init_armv6.c
Simple merge

diff --cc libavcodec/arm/idctdsp_init_neon.c
Simple merge

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