Commit 8259f8a7 authored by Paul B Mahol's avatar Paul B Mahol

avcodec: add FM Screen Capture Codec decoder

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 25d9cb46
...@@ -22,6 +22,7 @@ version <next>: ...@@ -22,6 +22,7 @@ version <next>:
- threshold filter - threshold filter
- midequalizer filter - midequalizer filter
- Optimal Huffman tables for (M)JPEG encoding - Optimal Huffman tables for (M)JPEG encoding
- FM Screen Capture Codec decoder
version 3.2: version 3.2:
- libopenmpt demuxer - libopenmpt demuxer
......
...@@ -716,6 +716,7 @@ following image formats are supported: ...@@ -716,6 +716,7 @@ following image formats are supported:
@item Flash Screen Video v2 @tab X @tab X @item Flash Screen Video v2 @tab X @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
......
...@@ -293,6 +293,7 @@ OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o ...@@ -293,6 +293,7 @@ OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o
OBJS-$(CONFIG_FLASHSV2_ENCODER) += flashsv2enc.o OBJS-$(CONFIG_FLASHSV2_ENCODER) += flashsv2enc.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
......
...@@ -192,6 +192,7 @@ void avcodec_register_all(void) ...@@ -192,6 +192,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (FLASHSV2, flashsv2); REGISTER_ENCDEC (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);
......
...@@ -414,6 +414,7 @@ enum AVCodecID { ...@@ -414,6 +414,7 @@ enum AVCodecID {
AV_CODEC_ID_PSD, AV_CODEC_ID_PSD,
AV_CODEC_ID_PIXLET, AV_CODEC_ID_PIXLET,
AV_CODEC_ID_SPEEDHQ, AV_CODEC_ID_SPEEDHQ,
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
......
...@@ -1353,6 +1353,13 @@ static const AVCodecDescriptor codec_descriptors[] = { ...@@ -1353,6 +1353,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 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 78 #define LIBAVCODEC_VERSION_MINOR 79
#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, \
......
...@@ -448,6 +448,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -448,6 +448,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '5') }, { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '5') },
{ AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '7') }, { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '7') },
{ AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '9') }, { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '9') },
{ 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