Commit d645e0d6 authored by hwren's avatar hwren Committed by Steven Liu

lavc: add AVS2/IEEE 1857.4 parser

Tested-by: 's avatarSteven Liu <lq@chinaffmpeg.org>
Signed-off-by: 's avatarhwren <hwrenx@126.com>
Signed-off-by: 's avatarSteven Liu <lq@chinaffmpeg.org>
parent a8ce6fb4
...@@ -996,6 +996,7 @@ OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ ...@@ -996,6 +996,7 @@ OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \
mpeg4audio.o mpeg4audio.o
OBJS-$(CONFIG_AC3_PARSER) += ac3tab.o aac_ac3_parser.o OBJS-$(CONFIG_AC3_PARSER) += ac3tab.o aac_ac3_parser.o
OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.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_BMP_PARSER) += bmp_parser.o
OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o
OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o OBJS-$(CONFIG_COOK_PARSER) += cook_parser.o
......
...@@ -409,6 +409,7 @@ enum AVCodecID { ...@@ -409,6 +409,7 @@ enum AVCodecID {
AV_CODEC_ID_DXV, AV_CODEC_ID_DXV,
AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_SCREENPRESSO,
AV_CODEC_ID_RSCC, AV_CODEC_ID_RSCC,
AV_CODEC_ID_AVS2,
AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_Y41P = 0x8000,
AV_CODEC_ID_AVRP, AV_CODEC_ID_AVRP,
......
...@@ -1394,6 +1394,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1394,6 +1394,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("innoHeim/Rsupport Screen Capture Codec"), .long_name = NULL_IF_CONFIG_SMALL("innoHeim/Rsupport Screen Capture Codec"),
.props = AV_CODEC_PROP_LOSSLESS, .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, .id = AV_CODEC_ID_Y41P,
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
......
...@@ -26,6 +26,7 @@ extern AVCodecParser ff_aac_parser; ...@@ -26,6 +26,7 @@ extern AVCodecParser ff_aac_parser;
extern AVCodecParser ff_aac_latm_parser; extern AVCodecParser ff_aac_latm_parser;
extern AVCodecParser ff_ac3_parser; extern AVCodecParser ff_ac3_parser;
extern AVCodecParser ff_adx_parser; extern AVCodecParser ff_adx_parser;
extern AVCodecParser ff_avs2_parser;
extern AVCodecParser ff_bmp_parser; extern AVCodecParser ff_bmp_parser;
extern AVCodecParser ff_cavsvideo_parser; extern AVCodecParser ff_cavsvideo_parser;
extern AVCodecParser ff_cook_parser; extern AVCodecParser ff_cook_parser;
......
...@@ -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 21 #define LIBAVCODEC_VERSION_MINOR 22
#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, \
......
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