Commit 481ebb1c authored by Paul B Mahol's avatar Paul B Mahol

avcodec: add MV30 decoder

parent df08db07
...@@ -56,6 +56,7 @@ version <next>: ...@@ -56,6 +56,7 @@ version <next>:
- CRI HCA demuxer - CRI HCA demuxer
- overlay_cuda filter - overlay_cuda filter
- switch from AvxSynth to AviSynth+ on Linux - switch from AvxSynth to AviSynth+ on Linux
- mv30 decoder
version 4.2: version 4.2:
......
...@@ -494,6 +494,7 @@ OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o ...@@ -494,6 +494,7 @@ OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
OBJS-$(CONFIG_MSVIDEO1_ENCODER) += msvideo1enc.o elbg.o OBJS-$(CONFIG_MSVIDEO1_ENCODER) += msvideo1enc.o elbg.o
OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o
OBJS-$(CONFIG_MTS2_DECODER) += mss4.o OBJS-$(CONFIG_MTS2_DECODER) += mss4.o
OBJS-$(CONFIG_MV30_DECODER) += mv30.o
OBJS-$(CONFIG_MVC1_DECODER) += mvcdec.o OBJS-$(CONFIG_MVC1_DECODER) += mvcdec.o
OBJS-$(CONFIG_MVC2_DECODER) += mvcdec.o OBJS-$(CONFIG_MVC2_DECODER) += mvcdec.o
OBJS-$(CONFIG_MVDV_DECODER) += midivid.o OBJS-$(CONFIG_MVDV_DECODER) += midivid.o
......
...@@ -217,6 +217,7 @@ extern AVCodec ff_msvideo1_encoder; ...@@ -217,6 +217,7 @@ extern AVCodec ff_msvideo1_encoder;
extern AVCodec ff_msvideo1_decoder; extern AVCodec ff_msvideo1_decoder;
extern AVCodec ff_mszh_decoder; extern AVCodec ff_mszh_decoder;
extern AVCodec ff_mts2_decoder; extern AVCodec ff_mts2_decoder;
extern AVCodec ff_mv30_decoder;
extern AVCodec ff_mvc1_decoder; extern AVCodec ff_mvc1_decoder;
extern AVCodec ff_mvc2_decoder; extern AVCodec ff_mvc2_decoder;
extern AVCodec ff_mvdv_decoder; extern AVCodec ff_mvdv_decoder;
......
...@@ -463,6 +463,7 @@ enum AVCodecID { ...@@ -463,6 +463,7 @@ enum AVCodecID {
AV_CODEC_ID_MVDV, AV_CODEC_ID_MVDV,
AV_CODEC_ID_MVHA, AV_CODEC_ID_MVHA,
AV_CODEC_ID_CDTOONS, AV_CODEC_ID_CDTOONS,
AV_CODEC_ID_MV30,
/* 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
......
...@@ -1754,6 +1754,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1754,6 +1754,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("CDToons video"), .long_name = NULL_IF_CONFIG_SMALL("CDToons video"),
.props = AV_CODEC_PROP_LOSSLESS, .props = AV_CODEC_PROP_LOSSLESS,
}, },
{
.id = AV_CODEC_ID_MV30,
.type = AVMEDIA_TYPE_VIDEO,
.name = "mv30",
.long_name = NULL_IF_CONFIG_SMALL("MidiVid 3.0"),
.props = AV_CODEC_PROP_LOSSY,
},
/* various PCM "codecs" */ /* various PCM "codecs" */
{ {
......
This diff is collapsed.
...@@ -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 77 #define LIBAVCODEC_VERSION_MINOR 78
#define LIBAVCODEC_VERSION_MICRO 101 #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, \
......
...@@ -492,6 +492,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -492,6 +492,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_IMM5, MKTAG('I', 'M', 'M', '5') }, { AV_CODEC_ID_IMM5, MKTAG('I', 'M', 'M', '5') },
{ 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_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