[FFmpeg-cvslog] avcodec/sbc: Fix non static function prefix

Michael Niedermayer git at videolan.org
Fri Apr 20 03:22:31 EEST 2018


ffmpeg | branch: release/4.0 | Michael Niedermayer <michael at niedermayer.cc> | Thu Apr 19 23:32:07 2018 +0200| [e36830c6959d286f5d55d374119a4a30ca8fad83] | committer: Michael Niedermayer

avcodec/sbc: Fix non static function prefix

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 9f1b99e7d076c9de1fefe971f1c70c96ebcf071b)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e36830c6959d286f5d55d374119a4a30ca8fad83
---

 libavcodec/sbc.c    | 2 +-
 libavcodec/sbc.h    | 2 +-
 libavcodec/sbcdec.c | 2 +-
 libavcodec/sbcenc.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/sbc.c b/libavcodec/sbc.c
index f7dba79f4f..b43b66e3f5 100644
--- a/libavcodec/sbc.c
+++ b/libavcodec/sbc.c
@@ -52,7 +52,7 @@ static const int sbc_offset8[4][8] = {
 /*
  * Calculates the CRC-8 of the first len bits in data
  */
-uint8_t sbc_crc8(const AVCRC *ctx, const uint8_t *data, size_t len)
+uint8_t ff_sbc_crc8(const AVCRC *ctx, const uint8_t *data, size_t len)
 {
     size_t byte_length = len >> 3;
     int bit_length = len & 7;
diff --git a/libavcodec/sbc.h b/libavcodec/sbc.h
index 405fadc3a6..de9c8d9aed 100644
--- a/libavcodec/sbc.h
+++ b/libavcodec/sbc.h
@@ -112,7 +112,7 @@ struct sbc_frame {
     const AVCRC *crc_ctx;
 };
 
-uint8_t sbc_crc8(const AVCRC *crc_ctx, const uint8_t *data, size_t len);
+uint8_t ff_sbc_crc8(const AVCRC *crc_ctx, const uint8_t *data, size_t len);
 void ff_sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8]);
 
 #endif /* AVCODEC_SBC_H */
diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c
index be703382ff..546b38c106 100644
--- a/libavcodec/sbcdec.c
+++ b/libavcodec/sbcdec.c
@@ -147,7 +147,7 @@ static int sbc_unpack_frame(const uint8_t *data, struct sbc_frame *frame,
         }
     }
 
-    if (data[3] != sbc_crc8(frame->crc_ctx, crc_header, crc_pos))
+    if (data[3] != ff_sbc_crc8(frame->crc_ctx, crc_header, crc_pos))
         return -3;
 
     ff_sbc_calculate_bits(frame, bits);
diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c
index a0064c0e8c..e2929e22ac 100644
--- a/libavcodec/sbcenc.c
+++ b/libavcodec/sbcenc.c
@@ -156,7 +156,7 @@ static size_t sbc_pack_frame(AVPacket *avpkt, struct sbc_frame *frame,
     if (crc_pos % 8)
         crc_header[crc_pos >> 3] <<= 8 - (crc_pos % 8);
 
-    avpkt->data[3] = sbc_crc8(frame->crc_ctx, crc_header, crc_pos);
+    avpkt->data[3] = ff_sbc_crc8(frame->crc_ctx, crc_header, crc_pos);
 
     ff_sbc_calculate_bits(frame, bits);
 



More information about the ffmpeg-cvslog mailing list