diff options
| author | hwren <hwrenx@126.com> | 2018-07-27 11:44:59 +0800 |
|---|---|---|
| committer | Steven Liu <lq@chinaffmpeg.org> | 2018-07-27 20:07:45 +0800 |
| commit | d645e0d6c1f26b5c063093dd9ce0f02b3369cdc2 (patch) | |
| tree | 80ebf28dd806398f85853348ef2550e1929290ca | |
| parent | a8ce6fb425e07e60eb06d3f44992fdb91f23aafb (diff) | |
| download | ffmpeg-d645e0d6c1f26b5c063093dd9ce0f02b3369cdc2.tar.gz | |
lavc: add AVS2/IEEE 1857.4 parser
Tested-by: Steven Liu <lq@chinaffmpeg.org>
Signed-off-by: hwren <hwrenx@126.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 7 | ||||
| -rw-r--r-- | libavcodec/parsers.c | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
5 files changed, 12 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e62603f0dd..c1a7d2f292 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -996,6 +996,7 @@ OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ mpeg4audio.o OBJS-$(CONFIG_AC3_PARSER) += ac3tab.o aac_ac3_parser.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o +OBJS-$(CONFIG_AVS2_PARSER) += avs2_parser.o OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f85af3f15d..1266879206 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -409,6 +409,7 @@ enum AVCodecID { AV_CODEC_ID_DXV, AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_RSCC, + AV_CODEC_ID_AVS2, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index a126c974e1..2fe4aaaa7b 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1395,6 +1395,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_AVS2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "avs2", + .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"), + .props = AV_CODEC_PROP_LOSSY, + }, + { .id = AV_CODEC_ID_Y41P, .type = AVMEDIA_TYPE_VIDEO, .name = "y41p", diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index f2886ff45f..cb86cceecc 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -26,6 +26,7 @@ extern AVCodecParser ff_aac_parser; extern AVCodecParser ff_aac_latm_parser; extern AVCodecParser ff_ac3_parser; extern AVCodecParser ff_adx_parser; +extern AVCodecParser ff_avs2_parser; extern AVCodecParser ff_bmp_parser; extern AVCodecParser ff_cavsvideo_parser; extern AVCodecParser ff_cook_parser; diff --git a/libavcodec/version.h b/libavcodec/version.h index 72e70945f7..3f0d98efdf 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 21 -#define LIBAVCODEC_VERSION_MICRO 106 +#define LIBAVCODEC_VERSION_MINOR 22 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |