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
4e8cbbf7
Commit
4e8cbbf7
authored
Oct 10, 2018
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: add Amuse Graphics decoder
This work is sponsored by VideoLAN.
parent
52d8f35b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
668 additions
and
2 deletions
+668
-2
Changelog
Changelog
+1
-0
Makefile
libavcodec/Makefile
+1
-0
agm.c
libavcodec/agm.c
+653
-0
allcodecs.c
libavcodec/allcodecs.c
+1
-0
avcodec.h
libavcodec/avcodec.h
+1
-0
codec_desc.c
libavcodec/codec_desc.c
+7
-0
version.h
libavcodec/version.h
+2
-2
riff.c
libavformat/riff.c
+2
-0
No files found.
Changelog
View file @
4e8cbbf7
...
...
@@ -20,6 +20,7 @@ version <next>:
- libaribb24 based ARIB STD-B24 caption support (profiles A and C)
- Support decoding of HEVC 4:4:4 content in nvdec and cuviddec
- removed libndi-newtek
- agm decoder
version 4.1:
...
...
libavcodec/Makefile
View file @
4e8cbbf7
...
...
@@ -173,6 +173,7 @@ OBJS-$(CONFIG_AC3_FIXED_DECODER) += ac3dec_fixed.o ac3dec_data.o ac3.o kbd
OBJS-$(CONFIG_AC3_ENCODER)
+=
ac3enc_float.o
ac3enc.o
ac3tab.o
\
ac3.o
kbdwin.o
OBJS-$(CONFIG_AC3_FIXED_ENCODER)
+=
ac3enc_fixed.o
ac3enc.o
ac3tab.o
ac3.o
OBJS-$(CONFIG_AGM_DECODER)
+=
agm.o
OBJS-$(CONFIG_AIC_DECODER)
+=
aic.o
OBJS-$(CONFIG_ALAC_DECODER)
+=
alac.o
alac_data.o
alacdsp.o
OBJS-$(CONFIG_ALAC_ENCODER)
+=
alacenc.o
alac_data.o
...
...
libavcodec/agm.c
0 → 100644
View file @
4e8cbbf7
This diff is collapsed.
Click to expand it.
libavcodec/allcodecs.c
View file @
4e8cbbf7
...
...
@@ -35,6 +35,7 @@ extern AVCodec ff_aasc_decoder;
extern
AVCodec
ff_aic_decoder
;
extern
AVCodec
ff_alias_pix_encoder
;
extern
AVCodec
ff_alias_pix_decoder
;
extern
AVCodec
ff_agm_decoder
;
extern
AVCodec
ff_amv_encoder
;
extern
AVCodec
ff_amv_decoder
;
extern
AVCodec
ff_anm_decoder
;
...
...
libavcodec/avcodec.h
View file @
4e8cbbf7
...
...
@@ -454,6 +454,7 @@ enum AVCodecID {
AV_CODEC_ID_RASC
,
AV_CODEC_ID_HYMT
,
AV_CODEC_ID_ARBC
,
AV_CODEC_ID_AGM
,
/* 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 @
4e8cbbf7
...
...
@@ -1705,6 +1705,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Gryphon's Anim Compressor"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
{
.
id
=
AV_CODEC_ID_AGM
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"agm"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Amuse Graphics Movie"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
/* various PCM "codecs" */
{
...
...
libavcodec/version.h
View file @
4e8cbbf7
...
...
@@ -28,8 +28,8 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 4
7
#define LIBAVCODEC_VERSION_MICRO 10
6
#define LIBAVCODEC_VERSION_MINOR 4
8
#define LIBAVCODEC_VERSION_MICRO 10
0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
libavformat/riff.c
View file @
4e8cbbf7
...
...
@@ -477,6 +477,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{
AV_CODEC_ID_RASC
,
MKTAG
(
'R'
,
'A'
,
'S'
,
'C'
)
},
{
AV_CODEC_ID_HYMT
,
MKTAG
(
'H'
,
'Y'
,
'M'
,
'T'
)
},
{
AV_CODEC_ID_ARBC
,
MKTAG
(
'A'
,
'R'
,
'B'
,
'C'
)
},
{
AV_CODEC_ID_AGM
,
MKTAG
(
'A'
,
'G'
,
'M'
,
'2'
)
},
{
AV_CODEC_ID_AGM
,
MKTAG
(
'A'
,
'G'
,
'M'
,
'3'
)
},
{
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