Browse Source

mjpegenc_common: add missing ff_ prefix to init_uni_ac_vlc

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
tags/n3.3
Rostislav Pehlivanov 9 years ago
parent
commit
d164ef6589
3 changed files with 6 additions and 6 deletions
  1. +2
    -2
      libavcodec/mjpegenc.c
  2. +3
    -3
      libavcodec/mjpegenc_common.c
  3. +1
    -1
      libavcodec/mjpegenc_common.h

+ 2
- 2
libavcodec/mjpegenc.c View File

@@ -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 =


+ 3
- 3
libavcodec/mjpegenc_common.c View File

@@ -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 =


+ 1
- 1
libavcodec/mjpegenc_common.h View File

@@ -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 */

Loading…
Cancel
Save