Commit 053185c2 authored by Benjamin Larsson's avatar Benjamin Larsson

Flash screen video encoder.

Originally committed as revision 7615 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 434f2c18
......@@ -118,7 +118,7 @@ Codecs:
ffv1.c Michael Niedermayer
flac.c Alex Beregszaszi
flacenc.c Justin Ruggles
flashsv.c Benjamin Larsson
flashsv* Benjamin Larsson
flicvideo.c Mike Melanson
g726.c Roman Shaposhnik
gifdec.c Baptiste Coudurier
......
......@@ -245,6 +245,7 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o
# external dependencies
ifeq ($(CONFIG_ZLIB),yes)
OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o
OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o
endif
# external codec libraries
......
......@@ -66,7 +66,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (FFV1, ffv1);
REGISTER_ENCDEC (FFVHUFF, ffvhuff);
#ifdef CONFIG_ZLIB
REGISTER_DECODER(FLASHSV, flashsv);
REGISTER_ENCDEC (FLASHSV, flashsv);
#endif
REGISTER_DECODER(FLIC, flic);
REGISTER_ENCDEC (FLV, flv);
......
......@@ -37,8 +37,8 @@ extern "C" {
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
#define LIBAVCODEC_VERSION_INT ((51<<16)+(28<<8)+0)
#define LIBAVCODEC_VERSION 51.28.0
#define LIBAVCODEC_VERSION_INT ((51<<16)+(29<<8)+0)
#define LIBAVCODEC_VERSION 51.29.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
......@@ -2189,6 +2189,7 @@ extern AVCodec sonic_encoder;
extern AVCodec sonic_ls_encoder;
extern AVCodec svq1_encoder;
extern AVCodec x264_encoder;
extern AVCodec flashsv_encoder;
extern AVCodec gif_decoder;
extern AVCodec h263_decoder;
......
This diff is collapsed.
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