Commit 4e8cbbf7 authored by Paul B Mahol's avatar Paul B Mahol

avcodec: add Amuse Graphics decoder

This work is sponsored by VideoLAN.
parent 52d8f35b
...@@ -20,6 +20,7 @@ version <next>: ...@@ -20,6 +20,7 @@ version <next>:
- libaribb24 based ARIB STD-B24 caption support (profiles A and C) - libaribb24 based ARIB STD-B24 caption support (profiles A and C)
- Support decoding of HEVC 4:4:4 content in nvdec and cuviddec - Support decoding of HEVC 4:4:4 content in nvdec and cuviddec
- removed libndi-newtek - removed libndi-newtek
- agm decoder
version 4.1: version 4.1:
......
...@@ -173,6 +173,7 @@ OBJS-$(CONFIG_AC3_FIXED_DECODER) += ac3dec_fixed.o ac3dec_data.o ac3.o kbd ...@@ -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 \ OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3enc.o ac3tab.o \
ac3.o kbdwin.o ac3.o kbdwin.o
OBJS-$(CONFIG_AC3_FIXED_ENCODER) += ac3enc_fixed.o ac3enc.o ac3tab.o ac3.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_AIC_DECODER) += aic.o
OBJS-$(CONFIG_ALAC_DECODER) += alac.o alac_data.o alacdsp.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o alac_data.o alacdsp.o
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o alac_data.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o alac_data.o
......
This diff is collapsed.
...@@ -35,6 +35,7 @@ extern AVCodec ff_aasc_decoder; ...@@ -35,6 +35,7 @@ extern AVCodec ff_aasc_decoder;
extern AVCodec ff_aic_decoder; extern AVCodec ff_aic_decoder;
extern AVCodec ff_alias_pix_encoder; extern AVCodec ff_alias_pix_encoder;
extern AVCodec ff_alias_pix_decoder; extern AVCodec ff_alias_pix_decoder;
extern AVCodec ff_agm_decoder;
extern AVCodec ff_amv_encoder; extern AVCodec ff_amv_encoder;
extern AVCodec ff_amv_decoder; extern AVCodec ff_amv_decoder;
extern AVCodec ff_anm_decoder; extern AVCodec ff_anm_decoder;
......
...@@ -454,6 +454,7 @@ enum AVCodecID { ...@@ -454,6 +454,7 @@ enum AVCodecID {
AV_CODEC_ID_RASC, AV_CODEC_ID_RASC,
AV_CODEC_ID_HYMT, AV_CODEC_ID_HYMT,
AV_CODEC_ID_ARBC, AV_CODEC_ID_ARBC,
AV_CODEC_ID_AGM,
/* various PCM "codecs" */ /* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
......
...@@ -1705,6 +1705,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1705,6 +1705,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("Gryphon's Anim Compressor"), .long_name = NULL_IF_CONFIG_SMALL("Gryphon's Anim Compressor"),
.props = AV_CODEC_PROP_LOSSY, .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" */ /* various PCM "codecs" */
{ {
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 47 #define LIBAVCODEC_VERSION_MINOR 48
#define LIBAVCODEC_VERSION_MICRO 106 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
......
...@@ -477,6 +477,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -477,6 +477,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_RASC, MKTAG('R', 'A', 'S', 'C') }, { AV_CODEC_ID_RASC, MKTAG('R', 'A', 'S', 'C') },
{ AV_CODEC_ID_HYMT, MKTAG('H', 'Y', 'M', 'T') }, { AV_CODEC_ID_HYMT, MKTAG('H', 'Y', 'M', 'T') },
{ AV_CODEC_ID_ARBC, MKTAG('A', 'R', 'B', 'C') }, { 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 } { AV_CODEC_ID_NONE, 0 }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment