summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorSteve L'Homme <slhomme@divxcorp.com>2006-08-29 07:34:58 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2006-08-29 07:34:58 +0000
commit8ac17293d328b3642872445fc77e1f98eca90175 (patch)
tree01294c09093f60841c7e516d5ed07bba862d8330 /libavformat
parent776fe466b280a960485509d92e1ece3656efb8f1 (diff)
AVISynth support, patch by Steve Lhomme % slhomme A divxcorp P com %
Original Thread: Date: Aug 16, 2006 11:45 PM Subject: [Ffmpeg-devel] [PATCH] AVISynth support Originally committed as revision 6122 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile1
-rw-r--r--libavformat/allformats.c3
-rw-r--r--libavformat/allformats.h1
3 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index eecbcb25bf..eb413951db 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -27,6 +27,7 @@ OBJS-$(CONFIG_AU_DEMUXER) += au.o riff.o
OBJS-$(CONFIG_AU_MUXER) += au.o riff.o
OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o
OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o
+OBJS-$(CONFIG_AVISYNTH) += avisynth.o
OBJS-$(CONFIG_AVS_DEMUXER) += avs.o
OBJS-$(CONFIG_CRC_MUXER) += crc.o
OBJS-$(CONFIG_FRAMECRC_MUXER) += crc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 74d97cb81e..2cb66ffa98 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -83,6 +83,9 @@ void av_register_all(void)
#ifdef CONFIG_AVI_MUXER
av_register_output_format(&avi_muxer);
#endif
+#ifdef CONFIG_AVISYNTH
+ av_register_input_format(&avisynth_demuxer);
+#endif
#ifdef CONFIG_AVS_DEMUXER
av_register_input_format(&avs_demuxer);
#endif
diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 89e1ae7d06..946519ed71 100644
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -16,6 +16,7 @@ extern AVInputFormat audio_demuxer;
extern AVOutputFormat audio_muxer;
extern AVInputFormat avi_demuxer;
extern AVOutputFormat avi_muxer;
+extern AVInputFormat avisynth_demuxer;
extern AVInputFormat avs_demuxer;
extern AVOutputFormat crc_muxer;
extern AVOutputFormat framecrc_muxer;