aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2007-09-26 18:37:20 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2007-09-26 18:37:20 +0000
commit53b73365001bc85f6e97b4be8905b45edec119aa (patch)
treef232f02c7aaf6283af7057e0fc1b898819be0a8a
parentea10ddde965c1cd773d14a0227fd659133ff8db2 (diff)
downloadffmpeg-53b73365001bc85f6e97b4be8905b45edec119aa.tar.gz
Fix avisynth compilation after allformats.h was removed
Originally committed as revision 10594 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure1
-rw-r--r--libavformat/allformats.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/configure b/configure
index 60db84fe6c..5c64fe3764 100755
--- a/configure
+++ b/configure
@@ -793,6 +793,7 @@ audio_beos_demuxer_deps="audio_beos"
audio_beos_demuxer_extralibs="-lmedia -lbe"
audio_beos_muxer_deps="audio_beos"
audio_beos_muxer_extralibs="-lmedia -lbe"
+avisynth_demuxer_deps="avisynth"
bktr_demuxer_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
dv1394_demuxer_deps="dv1394"
libdc1394_demuxer_deps="libdc1394"
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 6ed3eb83d4..515e6f41c0 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -64,9 +64,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX (AU, au);
REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);
REGISTER_MUXDEMUX (AVI, avi);
-#ifdef CONFIG_AVISYNTH
- av_register_input_format(&avisynth_demuxer);
-#endif
+ REGISTER_DEMUXER (AVISYNTH, avisynth);
REGISTER_DEMUXER (AVS, avs);
REGISTER_DEMUXER (BETHSOFTVID, bethsoftvid);
REGISTER_DEMUXER (BKTR, bktr);