mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-27 13:30:45 +00:00
ZMBV encoder
Originally committed as revision 7242 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
f27a726809
commit
f48d6e1b44
@ -38,7 +38,7 @@ version <next>
|
||||
- ADTS AAC file reading and writing
|
||||
- Creative VOC file reading and writing
|
||||
- American Laser Games multimedia (*.mm) playback system
|
||||
- Zip Blocks Motion Video decoder
|
||||
- Zip Blocks Motion Video decoder and encoder
|
||||
- Improved Theora/VP3 decoder
|
||||
- True Audio (TTA) decoder
|
||||
- AVS demuxer and video decoder
|
||||
|
@ -989,7 +989,7 @@ following image formats are supported:
|
||||
@item Fraps FPS1 @tab @tab X @tab
|
||||
@item CamStudio @tab @tab X @tab fourcc: CSCD
|
||||
@item American Laser Games Video @tab @tab X @tab Used in games like Mad Dog McCree
|
||||
@item ZMBV @tab @tab X @tab
|
||||
@item ZMBV @tab X @tab X @tab Encoder works only on PAL8
|
||||
@item AVS Video @tab @tab X @tab Video encoding used by the Creature Shock game.
|
||||
@item Smacker Video @tab @tab X @tab Video encoding used in Smacker.
|
||||
@item RTjpeg @tab @tab X @tab Video encoding used in NuppelVideo files.
|
||||
|
@ -167,6 +167,7 @@ OBJS-$(CONFIG_XL_DECODER) += xl.o
|
||||
OBJS-$(CONFIG_ZLIB_DECODER) += lcl.o
|
||||
OBJS-$(CONFIG_ZLIB_ENCODER) += lcl.o
|
||||
OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.o
|
||||
OBJS-$(CONFIG_ZMBV_ENCODER) += zmbvenc.o
|
||||
|
||||
OBJS-$(CONFIG_PCM_S32LE_DECODER) += pcm.o
|
||||
OBJS-$(CONFIG_PCM_S32LE_ENCODER) += pcm.o
|
||||
|
@ -155,7 +155,9 @@ void avcodec_register_all(void)
|
||||
REGISTER_ENCODER(XVID, xvid);
|
||||
#endif
|
||||
REGISTER_ENCDEC (ZLIB, zlib);
|
||||
REGISTER_DECODER(ZMBV, zmbv);
|
||||
#ifdef CONFIG_ZLIB
|
||||
REGISTER_ENCDEC (ZMBV, zmbv);
|
||||
#endif
|
||||
|
||||
/* audio codecs */
|
||||
#ifdef CONFIG_FAAD
|
||||
|
@ -37,8 +37,8 @@ extern "C" {
|
||||
#define AV_STRINGIFY(s) AV_TOSTRING(s)
|
||||
#define AV_TOSTRING(s) #s
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT ((51<<16)+(25<<8)+0)
|
||||
#define LIBAVCODEC_VERSION 51.25.0
|
||||
#define LIBAVCODEC_VERSION_INT ((51<<16)+(26<<8)+0)
|
||||
#define LIBAVCODEC_VERSION 51.26.0
|
||||
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
|
||||
|
||||
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
|
||||
@ -2303,6 +2303,7 @@ extern AVCodec libgsm_decoder;
|
||||
extern AVCodec bmp_decoder;
|
||||
extern AVCodec mmvideo_decoder;
|
||||
extern AVCodec zmbv_decoder;
|
||||
extern AVCodec zmbv_encoder;
|
||||
extern AVCodec avs_decoder;
|
||||
extern AVCodec smacker_decoder;
|
||||
extern AVCodec smackaud_decoder;
|
||||
|
Loading…
Reference in New Issue
Block a user