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
42a99b76
Commit
42a99b76
authored
Aug 03, 2018
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: add IMM4 decoder
This work is sponsored by VideoLAN.
parent
dcef44f1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
514 additions
and
1 deletion
+514
-1
Changelog
Changelog
+1
-0
Makefile
libavcodec/Makefile
+1
-0
allcodecs.c
libavcodec/allcodecs.c
+1
-0
avcodec.h
libavcodec/avcodec.h
+1
-0
codec_desc.c
libavcodec/codec_desc.c
+7
-0
imm4.c
libavcodec/imm4.c
+501
-0
version.h
libavcodec/version.h
+1
-1
riff.c
libavformat/riff.c
+1
-0
No files found.
Changelog
View file @
42a99b76
...
...
@@ -17,6 +17,7 @@ version <next>:
- lensfun wrapper filter
- colorconstancy filter
- AVS2 video decoder via libdavs2
- IMM4 video decoder
version 4.0:
...
...
libavcodec/Makefile
View file @
42a99b76
...
...
@@ -385,6 +385,7 @@ OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o
OBJS-$(CONFIG_IDF_DECODER)
+=
bintext.o
cga_data.o
OBJS-$(CONFIG_IFF_ILBM_DECODER)
+=
iff.o
OBJS-$(CONFIG_IMC_DECODER)
+=
imc.o
OBJS-$(CONFIG_IMM4_DECODER)
+=
imm4.o
OBJS-$(CONFIG_INDEO2_DECODER)
+=
indeo2.o
OBJS-$(CONFIG_INDEO3_DECODER)
+=
indeo3.o
OBJS-$(CONFIG_INDEO4_DECODER)
+=
indeo4.o
ivi.o
...
...
libavcodec/allcodecs.c
View file @
42a99b76
...
...
@@ -153,6 +153,7 @@ extern AVCodec ff_huffyuv_encoder;
extern
AVCodec
ff_huffyuv_decoder
;
extern
AVCodec
ff_idcin_decoder
;
extern
AVCodec
ff_iff_ilbm_decoder
;
extern
AVCodec
ff_imm4_decoder
;
extern
AVCodec
ff_indeo2_decoder
;
extern
AVCodec
ff_indeo3_decoder
;
extern
AVCodec
ff_indeo4_decoder
;
...
...
libavcodec/avcodec.h
View file @
42a99b76
...
...
@@ -447,6 +447,7 @@ enum AVCodecID {
AV_CODEC_ID_SVG
,
AV_CODEC_ID_GDV
,
AV_CODEC_ID_FITS
,
AV_CODEC_ID_IMM4
,
/* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO
=
0x10000
,
///< A dummy id pointing at the start of audio codecs
...
...
libavcodec/codec_desc.c
View file @
42a99b76
...
...
@@ -1654,6 +1654,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"FITS (Flexible Image Transport System)"
),
.
props
=
AV_CODEC_PROP_INTRA_ONLY
|
AV_CODEC_PROP_LOSSLESS
,
},
{
.
id
=
AV_CODEC_ID_IMM4
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"imm4"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Infinity IMM4"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
/* various PCM "codecs" */
{
...
...
libavcodec/imm4.c
0 → 100644
View file @
42a99b76
This diff is collapsed.
Click to expand it.
libavcodec/version.h
View file @
42a99b76
...
...
@@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 2
3
#define LIBAVCODEC_VERSION_MINOR 2
4
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
...
libavformat/riff.c
View file @
42a99b76
...
...
@@ -470,6 +470,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{
AV_CODEC_ID_AV1
,
MKTAG
(
'A'
,
'V'
,
'0'
,
'1'
)
},
{
AV_CODEC_ID_MSCC
,
MKTAG
(
'M'
,
'S'
,
'C'
,
'C'
)
},
{
AV_CODEC_ID_SRGC
,
MKTAG
(
'S'
,
'R'
,
'G'
,
'C'
)
},
{
AV_CODEC_ID_IMM4
,
MKTAG
(
'I'
,
'M'
,
'M'
,
'4'
)
},
{
AV_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