[FFmpeg-cvslog] r25746 - in trunk/libavcodec: Makefile allcodecs.c

[aurel]

Author: aurel
Date: Sat Nov 13 15:17:57 2010
New Revision: 25746

Log:
add ASS encoder and decoder

Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/allcodecs.c

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Sat Nov 13 14:57:49 2010	(r25745)
+++ trunk/libavcodec/Makefile	Sat Nov 13 15:17:57 2010	(r25746)
@@ -66,6 +66,8 @@ OBJS-$(CONFIG_AMV_DECODER)             +
 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

Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c	Sat Nov 13 14:57:49 2010	(r25745)
+++ trunk/libavcodec/allcodecs.c	Sat Nov 13 15:17:57 2010	(r25746)
@@ -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);