aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-22 22:23:04 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-22 22:23:04 +0100
commit672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3 (patch)
tree17a5bca7fe47fa6729fc3ec48cf9dee3ba37faa8 /libavcodec
parentd6d3cfb0aa23c1f6111f71889256874d86c2cf77 (diff)
parentf9279ee74936b4990fc46287c27816ef828cc06c (diff)
downloadffmpeg-672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3.tar.gz
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c': dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h Conflicts: libavcodec/imgconvert.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/bfin/vp3dsp_init.c2
-rw-r--r--libavcodec/bit_depth_template.c1
-rw-r--r--libavcodec/cavsdsp.c2
-rw-r--r--libavcodec/dsputil.h7
-rw-r--r--libavcodec/imgconvert.c2
-rw-r--r--libavcodec/indeo4data.h3
-rw-r--r--libavcodec/mathops.h4
-rw-r--r--libavcodec/mathtables.c4
-rw-r--r--libavcodec/mss3.c2
-rw-r--r--libavcodec/pgssubdec.c2
-rw-r--r--libavcodec/rv30dsp.c1
-rw-r--r--libavcodec/rv40dsp.c1
-rw-r--r--libavcodec/vp3.c2
-rw-r--r--libavcodec/vp8dsp.c2
14 files changed, 21 insertions, 14 deletions
diff --git a/libavcodec/bfin/vp3dsp_init.c b/libavcodec/bfin/vp3dsp_init.c
index 0adbc9644d..739750b6e4 100644
--- a/libavcodec/bfin/vp3dsp_init.c
+++ b/libavcodec/bfin/vp3dsp_init.c
@@ -23,8 +23,8 @@
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h"
+#include "libavcodec/mathops.h"
#include "libavcodec/vp3dsp.h"
-#include "libavcodec/dsputil.h"
void ff_bfin_vp3_idct(int16_t *block);
diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c
index 56c2935a24..80184892f5 100644
--- a/libavcodec/bit_depth_template.c
+++ b/libavcodec/bit_depth_template.c
@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "mathops.h"
#include "rnd_avg.h"
#include "libavutil/intreadwrite.h"
diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c
index d24df95c6d..a27915f57d 100644
--- a/libavcodec/cavsdsp.c
+++ b/libavcodec/cavsdsp.c
@@ -23,7 +23,9 @@
*/
#include <stdio.h>
+
#include "dsputil.h"
+#include "mathops.h"
#include "cavsdsp.h"
#include "libavutil/common.h"
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 4e16c92bde..8f83006006 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -36,16 +36,11 @@
/* encoding scans */
extern const uint8_t ff_alternate_horizontal_scan[64];
extern const uint8_t ff_alternate_vertical_scan[64];
-extern const uint8_t ff_zigzag_direct[64];
extern const uint8_t ff_zigzag248_direct[64];
-/* pixel operations */
-#define MAX_NEG_CROP 1024
-
-/* temporary */
extern uint32_t ff_square_tab[512];
-extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP];
+/* pixel operations */
void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 64510f3746..b830961fda 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -31,9 +31,9 @@
*/
#include "avcodec.h"
-#include "dsputil.h"
#include "imgconvert.h"
#include "internal.h"
+#include "mathops.h"
#include "libavutil/avassert.h"
#include "libavutil/colorspace.h"
#include "libavutil/common.h"
diff --git a/libavcodec/indeo4data.h b/libavcodec/indeo4data.h
index 0ea4f405ad..d96ee98502 100644
--- a/libavcodec/indeo4data.h
+++ b/libavcodec/indeo4data.h
@@ -28,8 +28,9 @@
#define AVCODEC_INDEO4DATA_H
#include <stdint.h>
-#include "dsputil.h"
+
#include "ivi_common.h"
+#include "mathops.h"
/**
* standard picture dimensions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index cc8ce557cc..b0e48d8919 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -27,9 +27,13 @@
#include "libavutil/common.h"
#include "config.h"
+#define MAX_NEG_CROP 1024
+
extern const uint32_t ff_inverse[257];
extern const uint8_t ff_reverse[256];
extern const uint8_t ff_sqrt_tab[256];
+extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP];
+extern const uint8_t ff_zigzag_direct[64];
#if ARCH_ARM
# include "arm/mathops.h"
diff --git a/libavcodec/mathtables.c b/libavcodec/mathtables.c
index 28ab6a6466..a07ac50c08 100644
--- a/libavcodec/mathtables.c
+++ b/libavcodec/mathtables.c
@@ -20,6 +20,8 @@
#include <stdint.h>
+#include "mathops.h"
+
/* a*inverse[b]>>32 == a/b for all 0<=a<=16909558 && 2<=b<=256
* for a>16909558, is an overestimate by less than 1 part in 1<<24 */
const uint32_t ff_inverse[257]={
@@ -91,7 +93,7 @@ const uint8_t ff_reverse[256] = {
#define times4(x) x, x, x, x
#define times256(x) times4(times4(times4(times4(times4(x)))))
-const uint8_t ff_crop_tab[256 + 2 * 1024] = {
+const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP] = {
times256(0x00),
0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c
index c6bb838045..075685b902 100644
--- a/libavcodec/mss3.c
+++ b/libavcodec/mss3.c
@@ -26,8 +26,8 @@
#include "avcodec.h"
#include "bytestream.h"
-#include "dsputil.h"
#include "internal.h"
+#include "mathops.h"
#include "mss34dsp.h"
#define HEADER_SIZE 27
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index dd618715d2..b2c779a3ca 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -25,9 +25,9 @@
*/
#include "avcodec.h"
-#include "dsputil.h"
#include "bytestream.h"
#include "internal.h"
+#include "mathops.h"
#include "libavutil/colorspace.h"
#include "libavutil/imgutils.h"
diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c
index 9d3407df7c..bd084bff7a 100644
--- a/libavcodec/rv30dsp.c
+++ b/libavcodec/rv30dsp.c
@@ -27,6 +27,7 @@
#include "avcodec.h"
#include "h264chroma.h"
#include "h264qpel.h"
+#include "mathops.h"
#include "rv34dsp.h"
#define RV30_LOWPASS(OPNAME, OP) \
diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c
index f2ebcf26b5..a4476b607a 100644
--- a/libavcodec/rv40dsp.c
+++ b/libavcodec/rv40dsp.c
@@ -26,6 +26,7 @@
#include "avcodec.h"
#include "h264qpel.h"
+#include "mathops.h"
#include "rv34dsp.h"
#include "libavutil/avassert.h"
#include "libavutil/common.h"
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 4988fbd33c..512e45905f 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -36,9 +36,9 @@
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "internal.h"
-#include "dsputil.h"
#include "get_bits.h"
#include "hpeldsp.h"
+#include "mathops.h"
#include "videodsp.h"
#include "vp3data.h"
#include "vp3dsp.h"
diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c
index fa759dfa11..6b8fb3d043 100644
--- a/libavcodec/vp8dsp.c
+++ b/libavcodec/vp8dsp.c
@@ -25,7 +25,7 @@
* VP8 compatible video decoder
*/
-#include "dsputil.h"
+#include "mathops.h"
#include "vp8dsp.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"