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
f31065f6
Commit
f31065f6
authored
Aug 24, 2006
by
Baptiste Coudurier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add codec id and tag for JPEG 2000
Originally committed as revision 6076 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
a9d21e78
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
avcodec.h
libavcodec/avcodec.h
+1
-0
riff.c
libavformat/riff.c
+1
-0
No files found.
libavcodec/avcodec.h
View file @
f31065f6
...
@@ -119,6 +119,7 @@ enum CodecID {
...
@@ -119,6 +119,7 @@ enum CodecID {
CODEC_ID_KMVC
,
CODEC_ID_KMVC
,
CODEC_ID_FLASHSV
,
CODEC_ID_FLASHSV
,
CODEC_ID_CAVS
,
CODEC_ID_CAVS
,
CODEC_ID_JPEG2000
,
/* various pcm "codecs" */
/* various pcm "codecs" */
CODEC_ID_PCM_S16LE
=
0x10000
,
CODEC_ID_PCM_S16LE
=
0x10000
,
...
...
libavformat/riff.c
View file @
f31065f6
...
@@ -153,6 +153,7 @@ const CodecTag codec_bmp_tags[] = {
...
@@ -153,6 +153,7 @@ const CodecTag codec_bmp_tags[] = {
{
CODEC_ID_ZMBV
,
MKTAG
(
'Z'
,
'M'
,
'B'
,
'V'
)
},
{
CODEC_ID_ZMBV
,
MKTAG
(
'Z'
,
'M'
,
'B'
,
'V'
)
},
{
CODEC_ID_KMVC
,
MKTAG
(
'K'
,
'M'
,
'V'
,
'C'
)
},
{
CODEC_ID_KMVC
,
MKTAG
(
'K'
,
'M'
,
'V'
,
'C'
)
},
{
CODEC_ID_CAVS
,
MKTAG
(
'C'
,
'A'
,
'V'
,
'S'
)
},
{
CODEC_ID_CAVS
,
MKTAG
(
'C'
,
'A'
,
'V'
,
'S'
)
},
{
CODEC_ID_JPEG2000
,
MKTAG
(
'M'
,
'J'
,
'2'
,
'C'
)
},
{
CODEC_ID_RAWVIDEO
,
0
},
{
CODEC_ID_RAWVIDEO
,
0
},
{
CODEC_ID_NONE
,
0
},
{
CODEC_ID_NONE
,
0
},
};
};
...
...
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