Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
4e66ab3b
Commit
4e66ab3b
authored
23 years ago
by
Fabrice Bellard
Browse files
Options
Downloads
Patches
Plain Diff
added MJPEG decoder + comments
Originally committed as revision 35 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
10b7b472
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libavcodec/avcodec.h
+1
-0
1 addition, 0 deletions
libavcodec/avcodec.h
libavcodec/common.c
+22
-2
22 additions, 2 deletions
libavcodec/common.c
libavcodec/utils.c
+1
-0
1 addition, 0 deletions
libavcodec/utils.c
with
24 additions
and
2 deletions
libavcodec/avcodec.h
+
1
−
0
View file @
4e66ab3b
...
...
@@ -111,6 +111,7 @@ extern AVCodec msmpeg4_decoder;
extern
AVCodec
mpeg_decoder
;
extern
AVCodec
h263i_decoder
;
extern
AVCodec
rv10_decoder
;
extern
AVCodec
mjpeg_decoder
;
/* dummy raw codecs */
extern
AVCodec
pcm_codec
;
...
...
This diff is collapsed.
Click to expand it.
libavcodec/common.c
+
22
−
2
View file @
4e66ab3b
...
...
@@ -121,7 +121,7 @@ void flush_put_bits(PutBitContext *s)
s
->
bit_buf
=
0
;
}
/* for jpeg : es
pac
e 0xff with 0x00 after it */
/* for jpeg : es
cap
e 0xff with 0x00 after it */
void
jput_bits
(
PutBitContext
*
s
,
int
n
,
unsigned
int
value
)
{
unsigned
int
bit_buf
,
b
;
...
...
@@ -401,7 +401,27 @@ static int build_table(VLC *vlc, int table_nb_bits,
}
/* wrap and size allow to handle most types of storage. */
/* Build VLC decoding tables suitable for use with get_vlc().
'nb_bits' set thee decoding table size (2^nb_bits) entries. The
bigger it is, the faster is the decoding. But it should not be too
big to save memory and L1 cache. '9' is a good compromise.
'nb_codes' : number of vlcs codes
'bits' : table which gives the size (in bits) of each vlc code.
'codes' : table which gives the bit pattern of of each vlc code.
'xxx_wrap' : give the number of bytes between each entry of the
'bits' or 'codes' tables.
'xxx_size' : gives the number of bytes of each entry of the 'bits'
or 'codes' tables.
'wrap' and 'size' allows to use any memory configuration and types
(byte/word/long) to store the 'bits' and 'codes' tables.
*/
int
init_vlc
(
VLC
*
vlc
,
int
nb_bits
,
int
nb_codes
,
const
void
*
bits
,
int
bits_wrap
,
int
bits_size
,
const
void
*
codes
,
int
codes_wrap
,
int
codes_size
)
...
...
This diff is collapsed.
Click to expand it.
libavcodec/utils.c
+
1
−
0
View file @
4e66ab3b
...
...
@@ -267,6 +267,7 @@ void avcodec_register_all(void)
register_avcodec
(
&
mpeg_decoder
);
register_avcodec
(
&
h263i_decoder
);
register_avcodec
(
&
rv10_decoder
);
register_avcodec
(
&
mjpeg_decoder
);
#ifdef CONFIG_MPGLIB
register_avcodec
(
&
mp3_decoder
);
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment