[FFmpeg-devel] [PATCH] checkasm: fix build with --enable-shared

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Tue Jul 21 21:18:58 CEST 2015


Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 libavcodec/bswapdsp.c     | 4 ++++
 libavcodec/bswapdsp.h     | 1 +
 libavcodec/h264pred.c     | 7 +++++++
 libavcodec/h264pred.h     | 2 ++
 libavcodec/h264qpel.c     | 5 +++++
 libavcodec/h264qpel.h     | 1 +
 tests/checkasm/bswapdsp.c | 2 +-
 tests/checkasm/h264pred.c | 2 +-
 tests/checkasm/h264qpel.c | 2 +-
 9 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/libavcodec/bswapdsp.c b/libavcodec/bswapdsp.c
index a6e1ec0..5edb0c4 100644
--- a/libavcodec/bswapdsp.c
+++ b/libavcodec/bswapdsp.c
@@ -54,3 +54,7 @@ av_cold void ff_bswapdsp_init(BswapDSPContext *c)
     if (ARCH_X86)
         ff_bswapdsp_init_x86(c);
 }
+
+av_cold void avpriv_bswapdsp_init(BswapDSPContext *c) {
+    ff_bswapdsp_init(c);
+}
diff --git a/libavcodec/bswapdsp.h b/libavcodec/bswapdsp.h
index f167d77..00b529b 100644
--- a/libavcodec/bswapdsp.h
+++ b/libavcodec/bswapdsp.h
@@ -27,6 +27,7 @@ typedef struct BswapDSPContext {
 } BswapDSPContext;
 
 void ff_bswapdsp_init(BswapDSPContext *c);
+void avpriv_bswapdsp_init(BswapDSPContext *c);
 void ff_bswapdsp_init_x86(BswapDSPContext *c);
 
 #endif /* AVCODEC_BSWAP_BUF_H */
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c
index 8f15f71..c28c010 100644
--- a/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@@ -601,3 +601,10 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
     if (ARCH_MIPS)
         ff_h264_pred_init_mips(h, codec_id, bit_depth, chroma_format_idc);
 }
+
+av_cold void avpriv_h264_pred_init(H264PredContext *h, int codec_id,
+                                   const int bit_depth,
+                                   int chroma_format_idc)
+{
+    ff_h264_pred_init(h, codec_id, bit_depth, chroma_format_idc);
+}
diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h
index 091dcbb..bd71dcf 100644
--- a/libavcodec/h264pred.h
+++ b/libavcodec/h264pred.h
@@ -113,6 +113,8 @@ typedef struct H264PredContext {
 
 void ff_h264_pred_init(H264PredContext *h, int codec_id,
                        const int bit_depth, const int chroma_format_idc);
+void avpriv_h264_pred_init(H264PredContext *h, int codec_id,
+                           const int bit_depth, const int chroma_format_idc);
 void ff_h264_pred_init_aarch64(H264PredContext *h, int codec_id,
                                const int bit_depth,
                                const int chroma_format_idc);
diff --git a/libavcodec/h264qpel.c b/libavcodec/h264qpel.c
index 50e82e2..024fe84 100644
--- a/libavcodec/h264qpel.c
+++ b/libavcodec/h264qpel.c
@@ -107,3 +107,8 @@ av_cold void ff_h264qpel_init(H264QpelContext *c, int bit_depth)
     if (ARCH_MIPS)
         ff_h264qpel_init_mips(c, bit_depth);
 }
+
+av_cold void avpriv_h264qpel_init(H264QpelContext *c, int bit_depth)
+{
+    ff_h264qpel_init(c, bit_depth);
+}
diff --git a/libavcodec/h264qpel.h b/libavcodec/h264qpel.h
index 7c57ad0..a1a6f04 100644
--- a/libavcodec/h264qpel.h
+++ b/libavcodec/h264qpel.h
@@ -30,6 +30,7 @@ typedef struct H264QpelContext {
 } H264QpelContext;
 
 void ff_h264qpel_init(H264QpelContext *c, int bit_depth);
+void avpriv_h264qpel_init(H264QpelContext *c, int bit_depth);
 
 void ff_h264qpel_init_aarch64(H264QpelContext *c, int bit_depth);
 void ff_h264qpel_init_arm(H264QpelContext *c, int bit_depth);
diff --git a/tests/checkasm/bswapdsp.c b/tests/checkasm/bswapdsp.c
index 6aa7a81..bc055f7 100644
--- a/tests/checkasm/bswapdsp.c
+++ b/tests/checkasm/bswapdsp.c
@@ -61,7 +61,7 @@ void checkasm_check_bswapdsp(void)
     DECLARE_ALIGNED(16, uint8_t, dst1)[BUF_SIZE];
     BswapDSPContext h;
 
-    ff_bswapdsp_init(&h);
+    avpriv_bswapdsp_init(&h);
 
     if (check_func(h.bswap_buf, "bswap_buf"))
         check_bswap(uint32_t);
diff --git a/tests/checkasm/h264pred.c b/tests/checkasm/h264pred.c
index edb4f89..ab0aba5 100644
--- a/tests/checkasm/h264pred.c
+++ b/tests/checkasm/h264pred.c
@@ -243,7 +243,7 @@ void checkasm_check_h264pred(void)
             int codec_id = codec_ids[codec];
             for (bit_depth = 8; bit_depth <= (codec_id == AV_CODEC_ID_H264 ? 10 : 8); bit_depth++)
                 for (chroma_format = 1; chroma_format <= (codec_id == AV_CODEC_ID_H264 ? 2 : 1); chroma_format++) {
-                    ff_h264_pred_init(&h, codec_id, bit_depth, chroma_format);
+                    avpriv_h264_pred_init(&h, codec_id, bit_depth, chroma_format);
                     tests[test].func(&h, buf0, buf1, codec, chroma_format, bit_depth);
                 }
         }
diff --git a/tests/checkasm/h264qpel.c b/tests/checkasm/h264qpel.c
index 7579f94..5727dd5 100644
--- a/tests/checkasm/h264qpel.c
+++ b/tests/checkasm/h264qpel.c
@@ -60,7 +60,7 @@ void checkasm_check_h264qpel(void)
         const char *op_name = op ? "avg" : "put";
 
         for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
-            ff_h264qpel_init(&h, bit_depth);
+            avpriv_h264qpel_init(&h, bit_depth);
             for (i = 0; i < (op ? 3 : 4); i++) {
                 int size = 16 >> i;
                 for (j = 0; j < 16; j++)
-- 
2.1.4


More information about the ffmpeg-devel mailing list