Commit 81124ba0 authored by Vitor Sessak's avatar Vitor Sessak
Browse files

Fix libavfilter compilation and make it more in line

with the other libav*.

Originally committed as revision 12301 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f15e6b86
......@@ -858,7 +858,7 @@ tcp_protocol_deps="network"
udp_protocol_deps="network"
# filters
vsrc_movie_deps="avfilter_lavf"
movie_filter_deps="avfilter_lavf"
# programs
ffplay_deps="sdl"
......@@ -962,7 +962,7 @@ find_things(){
thing=$1
pattern=$2
file=$source_path/$3
sed -n "s/^[^#]*$pattern.*(.*, *\\(.*\\)).*/\\1_$thing/p" "$file"
sed -n "s/^[^#]*$pattern.*([^,]*, *\\([^,]*\\)\(,.*\)*).*/\\1_$thing/p" "$file"
}
ENCODER_LIST=$(find_things encoder ENC libavcodec/allcodecs.c)
......@@ -974,9 +974,7 @@ DEMUXER_LIST=$(find_things demuxer DEMUX libavformat/allformats.c)
OUTDEV_LIST=$(find_things muxer _MUX libavdevice/alldevices.c)
INDEV_LIST=$(find_things demuxer DEMUX libavdevice/alldevices.c)
PROTOCOL_LIST=$(find_things protocol PROTOCOL libavformat/allformats.c)
VIDEO_FILTER_LIST=$(find_things vf_ VF_ libavfilter/allfilters.c)
SRC_FILTER_LIST=$(find_things vsrc_ VSRC_ libavfilter/allfilters.c)
FILTER_LIST="$SRC_FILTER_LIST $VIDEO_FILTER_LIST"
FILTER_LIST=$(find_things filter FILTER libavfilter/allfilters.c)
enable $ARCH_EXT_LIST \
$DECODER_LIST \
......@@ -1071,8 +1069,7 @@ for opt do
--enable-*=*|--disable-*=*)
eval `echo "$opt" | sed 's/=/-/;s/--/action=/;s/-/ thing=/;s/-/ name=/'`
case "$thing" in
encoder|decoder|muxer|demuxer|parser|bsf|protocol) $action ${optval}_${thing} ;;
filter) $action ${optval} ;;
encoder|decoder|muxer|demuxer|parser|bsf|protocol|filter) $action ${optval}_${thing} ;;
*) die_unknown "$opt" ;;
esac
;;
......@@ -1920,7 +1917,7 @@ echo "shared ${shared-no}"
echo "postprocessing support ${pp-no}"
echo "software scaler enabled ${swscaler-no}"
echo "new filter support ${avfilter-no}"
echo "filters using lavformat ${avfilter-lavf-no}"
echo "filters using lavformat ${avfilter_lavf-no}"
echo "video hooking ${vhook-no}"
if enabled vhook; then
echo "Imlib2 support ${imlib2-no}"
......
......@@ -7,7 +7,7 @@ OBJS = allfilters.o \
defaults.o \
formats.o \
#OBJS-$(CONFIG_VF_XXXX) += vf_xxx.o
#OBJS-$(CONFIG_XXX_FILTER) += vf_xxx.o
HEADERS = avfilter.h
......
......@@ -21,14 +21,10 @@
#include "avfilter.h"
#define REGISTER_VF(X,x) { \
extern AVFilter avfilter_vf_##x ; \
if(ENABLE_VF_##X ) avfilter_register(&avfilter_vf_##x ); }
#define REGISTER_VSRC(X,x) { \
extern AVFilter avfilter_vsrc_##x ; \
if(ENABLE_VSRC_##X ) avfilter_register(&avfilter_vsrc_##x ); }
#define REGISTER_FILTER(X,x,y) { \
extern AVFilter avfilter_##y##_##x ; \
if(ENABLE_##X##_FILTER ) avfilter_register(&avfilter_##y##_##x ); }
void avfilter_register_all(void)
{
......@@ -38,6 +34,6 @@ void avfilter_register_all(void)
return;
initialized = 1;
// REGISTER_VF(CROP,crop);
// REGISTER_FILTER (CROP,crop,vf);
}
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