Commit beaa963c authored by Peter Ross's avatar Peter Ross

ASCII/ANSI art decoder

Originally committed as revision 24299 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7199c3a4
...@@ -60,6 +60,7 @@ OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \ ...@@ -60,6 +60,7 @@ OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \
acelp_pitch_delay.o acelp_pitch_delay.o
OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o
OBJS-$(CONFIG_ANM_DECODER) += anm.o OBJS-$(CONFIG_ANM_DECODER) += anm.o
OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o
OBJS-$(CONFIG_APE_DECODER) += apedec.o OBJS-$(CONFIG_APE_DECODER) += apedec.o
OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o
OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o mpeg12data.o OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o mpeg12data.o
......
...@@ -69,6 +69,7 @@ void avcodec_register_all(void) ...@@ -69,6 +69,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (AASC, aasc); REGISTER_DECODER (AASC, aasc);
REGISTER_DECODER (AMV, amv); REGISTER_DECODER (AMV, amv);
REGISTER_DECODER (ANM, anm); REGISTER_DECODER (ANM, anm);
REGISTER_DECODER (ANSI, ansi);
REGISTER_ENCDEC (ASV1, asv1); REGISTER_ENCDEC (ASV1, asv1);
REGISTER_ENCDEC (ASV2, asv2); REGISTER_ENCDEC (ASV2, asv2);
REGISTER_DECODER (AURA, aura); REGISTER_DECODER (AURA, aura);
......
This diff is collapsed.
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 83 #define LIBAVCODEC_VERSION_MINOR 84
#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, \
...@@ -212,6 +212,7 @@ enum CodecID { ...@@ -212,6 +212,7 @@ enum CodecID {
CODEC_ID_YOP, CODEC_ID_YOP,
CODEC_ID_VP8, CODEC_ID_VP8,
CODEC_ID_PICTOR, CODEC_ID_PICTOR,
CODEC_ID_ANSI,
/* various PCM "codecs" */ /* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000, CODEC_ID_PCM_S16LE= 0x10000,
......
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