Commit 95a8a03a authored by Paul B Mahol's avatar Paul B Mahol Committed by Diego Biurrun

Add FM Screen Capture Codec decoder

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent 89d9869d
...@@ -13,6 +13,7 @@ version <next>: ...@@ -13,6 +13,7 @@ version <next>:
--x86asmexe=yasm to configure to restore the old behavior. --x86asmexe=yasm to configure to restore the old behavior.
- Cineform HD decoder - Cineform HD decoder
- VP9 superframe split/merge bitstream filters - VP9 superframe split/merge bitstream filters
- FM Screen Capture Codec decoder
version 12: version 12:
......
...@@ -667,6 +667,7 @@ following image formats are supported: ...@@ -667,6 +667,7 @@ following image formats are supported:
@item Flash Screen Video v2 @tab @tab X @item Flash Screen Video v2 @tab @tab X
@item Flash Video (FLV) @tab X @tab X @item Flash Video (FLV) @tab X @tab X
@tab Sorenson H.263 used in Flash @tab Sorenson H.263 used in Flash
@item FM Screen Capture Codec @tab @tab X
@item Forward Uncompressed @tab @tab X @item Forward Uncompressed @tab @tab X
@item Fraps @tab @tab X @item Fraps @tab @tab X
@item Go2Meeting @tab @tab X @item Go2Meeting @tab @tab X
......
...@@ -235,6 +235,7 @@ OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o ...@@ -235,6 +235,7 @@ OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o
OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o
OBJS-$(CONFIG_FLASHSV2_DECODER) += flashsv.o OBJS-$(CONFIG_FLASHSV2_DECODER) += flashsv.o
OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o
OBJS-$(CONFIG_FMVC_DECODER) += fmvc.o
OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o
OBJS-$(CONFIG_FRWU_DECODER) += frwu.o OBJS-$(CONFIG_FRWU_DECODER) += frwu.o
......
...@@ -161,6 +161,7 @@ void avcodec_register_all(void) ...@@ -161,6 +161,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(FLASHSV2, flashsv2); REGISTER_DECODER(FLASHSV2, flashsv2);
REGISTER_DECODER(FLIC, flic); REGISTER_DECODER(FLIC, flic);
REGISTER_ENCDEC (FLV, flv); REGISTER_ENCDEC (FLV, flv);
REGISTER_DECODER(FMVC, fmvc);
REGISTER_DECODER(FOURXM, fourxm); REGISTER_DECODER(FOURXM, fourxm);
REGISTER_DECODER(FRAPS, fraps); REGISTER_DECODER(FRAPS, fraps);
REGISTER_DECODER(FRWU, frwu); REGISTER_DECODER(FRWU, frwu);
......
...@@ -408,6 +408,7 @@ enum AVCodecID { ...@@ -408,6 +408,7 @@ enum AVCodecID {
AV_CODEC_ID_AV1, AV_CODEC_ID_AV1,
AV_CODEC_ID_PIXLET, AV_CODEC_ID_PIXLET,
AV_CODEC_ID_CFHD, AV_CODEC_ID_CFHD,
AV_CODEC_ID_FMVC,
/* 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
......
...@@ -1210,6 +1210,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1210,6 +1210,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("Apple Pixlet"), .long_name = NULL_IF_CONFIG_SMALL("Apple Pixlet"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
}, },
{
.id = AV_CODEC_ID_FMVC,
.type = AVMEDIA_TYPE_VIDEO,
.name = "fmvc",
.long_name = NULL_IF_CONFIG_SMALL("FM Screen Capture Codec"),
.props = AV_CODEC_PROP_LOSSLESS,
},
/* image codecs */ /* image 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 1 #define LIBAVCODEC_VERSION_MINOR 2
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
...@@ -369,6 +369,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -369,6 +369,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', 'A', 'G', 'Y') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', 'A', 'G', 'Y') },
{ AV_CODEC_ID_AV1, MKTAG('A', 'V', '0', '1') }, { AV_CODEC_ID_AV1, MKTAG('A', 'V', '0', '1') },
{ AV_CODEC_ID_CFHD, MKTAG('C', 'F', 'H', 'D') }, { AV_CODEC_ID_CFHD, MKTAG('C', 'F', 'H', 'D') },
{ AV_CODEC_ID_FMVC, MKTAG('F', 'M', 'V', 'C') },
{ 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