Commit cdd06db5 authored by Paul B Mahol's avatar Paul B Mahol

avcodec: add NotchLC decoder

parent b707abf0
...@@ -67,6 +67,7 @@ version <next>: ...@@ -67,6 +67,7 @@ version <next>:
- Pro Pinball Series Soundbank demuxer - Pro Pinball Series Soundbank demuxer
- pcm_rechunk bitstream filter - pcm_rechunk bitstream filter
- scdet filter - scdet filter
- NotchLC decoder
version 4.2: version 4.2:
......
...@@ -506,6 +506,7 @@ OBJS-$(CONFIG_MWSC_DECODER) += mwsc.o ...@@ -506,6 +506,7 @@ OBJS-$(CONFIG_MWSC_DECODER) += mwsc.o
OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o
OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o
OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o
OBJS-$(CONFIG_NOTCHLC_DECODER) += notchlc.o
OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o
OBJS-$(CONFIG_ON2AVC_DECODER) += on2avc.o on2avcdata.o OBJS-$(CONFIG_ON2AVC_DECODER) += on2avc.o on2avcdata.o
OBJS-$(CONFIG_OPUS_DECODER) += opusdec.o opus.o opus_celt.o opus_rc.o \ OBJS-$(CONFIG_OPUS_DECODER) += opusdec.o opus.o opus_celt.o opus_rc.o \
......
...@@ -224,6 +224,7 @@ extern AVCodec ff_mvdv_decoder; ...@@ -224,6 +224,7 @@ extern AVCodec ff_mvdv_decoder;
extern AVCodec ff_mvha_decoder; extern AVCodec ff_mvha_decoder;
extern AVCodec ff_mwsc_decoder; extern AVCodec ff_mwsc_decoder;
extern AVCodec ff_mxpeg_decoder; extern AVCodec ff_mxpeg_decoder;
extern AVCodec ff_notchlc_decoder;
extern AVCodec ff_nuv_decoder; extern AVCodec ff_nuv_decoder;
extern AVCodec ff_paf_video_decoder; extern AVCodec ff_paf_video_decoder;
extern AVCodec ff_pam_encoder; extern AVCodec ff_pam_encoder;
......
...@@ -1763,6 +1763,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1763,6 +1763,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("MidiVid 3.0"), .long_name = NULL_IF_CONFIG_SMALL("MidiVid 3.0"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY,
}, },
{
.id = AV_CODEC_ID_NOTCHLC,
.type = AVMEDIA_TYPE_VIDEO,
.name = "notchlc",
.long_name = NULL_IF_CONFIG_SMALL("NotchLC"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
},
/* various PCM "codecs" */ /* various PCM "codecs" */
{ {
......
...@@ -291,6 +291,7 @@ enum AVCodecID { ...@@ -291,6 +291,7 @@ enum AVCodecID {
AV_CODEC_ID_MVHA, AV_CODEC_ID_MVHA,
AV_CODEC_ID_CDTOONS, AV_CODEC_ID_CDTOONS,
AV_CODEC_ID_MV30, AV_CODEC_ID_MV30,
AV_CODEC_ID_NOTCHLC,
/* 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
......
This diff is collapsed.
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 84 #define LIBAVCODEC_VERSION_MINOR 85
#define LIBAVCODEC_VERSION_MICRO 100 #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, \
......
...@@ -313,6 +313,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { ...@@ -313,6 +313,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_PIXLET, MKTAG('p', 'x', 'l', 't') }, { AV_CODEC_ID_PIXLET, MKTAG('p', 'x', 'l', 't') },
{ AV_CODEC_ID_NOTCHLC, MKTAG('n', 'c', 'l', 'c') },
{ AV_CODEC_ID_NONE, 0 }, { AV_CODEC_ID_NONE, 0 },
}; };
......
...@@ -493,6 +493,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -493,6 +493,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MVDV, MKTAG('M', 'V', 'D', 'V') }, { AV_CODEC_ID_MVDV, MKTAG('M', 'V', 'D', 'V') },
{ AV_CODEC_ID_MVHA, MKTAG('M', 'V', 'H', 'A') }, { AV_CODEC_ID_MVHA, MKTAG('M', 'V', 'H', 'A') },
{ AV_CODEC_ID_MV30, MKTAG('M', 'V', '3', '0') }, { AV_CODEC_ID_MV30, MKTAG('M', 'V', '3', '0') },
{ AV_CODEC_ID_NOTCHLC, MKTAG('n', 'l', 'c', '1') },
{ 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