Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
d164ef65
Commit
d164ef65
authored
Feb 09, 2017
by
Rostislav Pehlivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mjpegenc_common: add missing ff_ prefix to init_uni_ac_vlc
Signed-off-by:
Rostislav Pehlivanov
<
atomnuker@gmail.com
>
parent
3aae1eff
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
mjpegenc.c
libavcodec/mjpegenc.c
+2
-2
mjpegenc_common.c
libavcodec/mjpegenc_common.c
+3
-3
mjpegenc_common.h
libavcodec/mjpegenc_common.h
+1
-1
No files found.
libavcodec/mjpegenc.c
View file @
d164ef65
...
...
@@ -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
=
...
...
libavcodec/mjpegenc_common.c
View file @
d164ef65
...
...
@@ -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
=
...
...
libavcodec/mjpegenc_common.h
View file @
d164ef65
...
...
@@ -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 */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment