diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-11-13 14:17:57 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-11-13 14:17:57 +0000 |
| commit | e9c098dbaa07686210c75fe2486b7fb8fea14c97 (patch) | |
| tree | 9627916b57011984f67c6891ce0573c14c1ad7e9 /libavcodec | |
| parent | cb2c971d91ef166914a4982e941aa71ffd496610 (diff) | |
| download | ffmpeg-e9c098dbaa07686210c75fe2486b7fb8fea14c97.tar.gz | |
add ASS encoder and decoder
Originally committed as revision 25746 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 04fe93542b..883f7646b2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -66,6 +66,8 @@ OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_ANM_DECODER) += anm.o OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o OBJS-$(CONFIG_APE_DECODER) += apedec.o +OBJS-$(CONFIG_ASS_DECODER) += assdec.o ass.o +OBJS-$(CONFIG_ASS_ENCODER) += assenc.o ass.o OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o mpeg12data.o OBJS-$(CONFIG_ASV2_DECODER) += asv1.o mpeg12data.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 66b858d93a..fbae0f68aa 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -342,6 +342,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (ADPCM_YAMAHA, adpcm_yamaha); /* subtitles */ + REGISTER_ENCDEC (ASS, ass); REGISTER_ENCDEC (DVBSUB, dvbsub); REGISTER_ENCDEC (DVDSUB, dvdsub); REGISTER_DECODER (PGSSUB, pgssub); |