Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
ff506c75
Commit
ff506c75
authored
Dec 01, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mjpegenc: do not pass MpegEncContext to put_huffman_table()
It only needs PutBitContext from it, so pass that directly.
parent
a1ba1f20
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
mjpegenc.c
libavcodec/mjpegenc.c
+5
-6
No files found.
libavcodec/mjpegenc.c
View file @
ff506c75
...
...
@@ -81,10 +81,9 @@ void ff_mjpeg_encode_close(MpegEncContext *s)
}
/* table_class: 0 = DC coef, 1 = AC coefs */
static
int
put_huffman_table
(
MpegEncContext
*
s
,
int
table_class
,
int
table_id
,
static
int
put_huffman_table
(
PutBitContext
*
p
,
int
table_class
,
int
table_id
,
const
uint8_t
*
bits_table
,
const
uint8_t
*
value_table
)
{
PutBitContext
*
p
=
&
s
->
pb
;
int
n
,
i
;
put_bits
(
p
,
4
,
table_class
);
...
...
@@ -136,14 +135,14 @@ static void jpeg_table_header(MpegEncContext *s)
ptr
=
put_bits_ptr
(
p
);
put_bits
(
p
,
16
,
0
);
/* patched later */
size
=
2
;
size
+=
put_huffman_table
(
s
,
0
,
0
,
avpriv_mjpeg_bits_dc_luminance
,
size
+=
put_huffman_table
(
p
,
0
,
0
,
avpriv_mjpeg_bits_dc_luminance
,
avpriv_mjpeg_val_dc
);
size
+=
put_huffman_table
(
s
,
0
,
1
,
avpriv_mjpeg_bits_dc_chrominance
,
size
+=
put_huffman_table
(
p
,
0
,
1
,
avpriv_mjpeg_bits_dc_chrominance
,
avpriv_mjpeg_val_dc
);
size
+=
put_huffman_table
(
s
,
1
,
0
,
avpriv_mjpeg_bits_ac_luminance
,
size
+=
put_huffman_table
(
p
,
1
,
0
,
avpriv_mjpeg_bits_ac_luminance
,
avpriv_mjpeg_val_ac_luminance
);
size
+=
put_huffman_table
(
s
,
1
,
1
,
avpriv_mjpeg_bits_ac_chrominance
,
size
+=
put_huffman_table
(
p
,
1
,
1
,
avpriv_mjpeg_bits_ac_chrominance
,
avpriv_mjpeg_val_ac_chrominance
);
AV_WB16
(
ptr
,
size
);
}
...
...
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