summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2017-02-09 02:56:13 +0000
committerRostislav Pehlivanov <atomnuker@gmail.com>2017-02-09 02:56:13 +0000
commitd164ef658970de4dbfc2374be0e86f3b017981ba (patch)
treea5a9cc4396bafe8d2941c4031116f9b07a3e390a
parent3aae1eff1263a91086f48ae5162aa28f8f9dc072 (diff)
mjpegenc_common: add missing ff_ prefix to init_uni_ac_vlc
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
-rw-r--r--libavcodec/mjpegenc.c4
-rw-r--r--libavcodec/mjpegenc_common.c6
-rw-r--r--libavcodec/mjpegenc_common.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index a4899c5d6e..9a97027990 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -80,8 +80,8 @@ av_cold int ff_mjpeg_encode_init(MpegEncContext *s)
avpriv_mjpeg_bits_ac_chrominance,
avpriv_mjpeg_val_ac_chrominance);
- init_uni_ac_vlc(m->huff_size_ac_luminance, m->uni_ac_vlc_len);
- init_uni_ac_vlc(m->huff_size_ac_chrominance, m->uni_chroma_ac_vlc_len);
+ ff_init_uni_ac_vlc(m->huff_size_ac_luminance, m->uni_ac_vlc_len);
+ ff_init_uni_ac_vlc(m->huff_size_ac_chrominance, m->uni_chroma_ac_vlc_len);
s->intra_ac_vlc_length =
s->intra_ac_vlc_last_length = m->uni_ac_vlc_len;
s->intra_chroma_ac_vlc_length =
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c
index 8ec3df9090..2a53cbf13f 100644
--- a/libavcodec/mjpegenc_common.c
+++ b/libavcodec/mjpegenc_common.c
@@ -36,7 +36,7 @@
#include "mjpegenc_huffman.h"
#include "mjpeg.h"
-av_cold void init_uni_ac_vlc(const uint8_t huff_size_ac[256], uint8_t *uni_ac_vlc_len)
+av_cold void ff_init_uni_ac_vlc(const uint8_t huff_size_ac[256], uint8_t *uni_ac_vlc_len)
{
int i;
@@ -505,8 +505,8 @@ int ff_mjpeg_encode_stuffing(MpegEncContext *s)
// Replace the VLCs with the optimal ones.
// The default ones may be used for trellis during quantization.
- init_uni_ac_vlc(m->huff_size_ac_luminance, m->uni_ac_vlc_len);
- init_uni_ac_vlc(m->huff_size_ac_chrominance, m->uni_chroma_ac_vlc_len);
+ ff_init_uni_ac_vlc(m->huff_size_ac_luminance, m->uni_ac_vlc_len);
+ ff_init_uni_ac_vlc(m->huff_size_ac_chrominance, m->uni_chroma_ac_vlc_len);
s->intra_ac_vlc_length =
s->intra_ac_vlc_last_length = m->uni_ac_vlc_len;
s->intra_chroma_ac_vlc_length =
diff --git a/libavcodec/mjpegenc_common.h b/libavcodec/mjpegenc_common.h
index 7d760f8a32..d9a565dfa9 100644
--- a/libavcodec/mjpegenc_common.h
+++ b/libavcodec/mjpegenc_common.h
@@ -40,6 +40,6 @@ void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int vsample[4
void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
uint8_t *huff_size, uint16_t *huff_code);
-av_cold void init_uni_ac_vlc(const uint8_t huff_size_ac[256], uint8_t *uni_ac_vlc_len);
+av_cold void ff_init_uni_ac_vlc(const uint8_t huff_size_ac[256], uint8_t *uni_ac_vlc_len);
#endif /* AVCODEC_MJPEGENC_COMMON_H */