Revision 81124ba0

View differences:

configure
858 858
udp_protocol_deps="network"
859 859

  
860 860
# filters
861
vsrc_movie_deps="avfilter_lavf"
861
movie_filter_deps="avfilter_lavf"
862 862

  
863 863
# programs
864 864
ffplay_deps="sdl"
......
962 962
    thing=$1
963 963
    pattern=$2
964 964
    file=$source_path/$3
965
    sed -n "s/^[^#]*$pattern.*(.*, *\\(.*\\)).*/\\1_$thing/p" "$file"
965
    sed -n "s/^[^#]*$pattern.*([^,]*, *\\([^,]*\\)\(,.*\)*).*/\\1_$thing/p" "$file"
966 966
}
967 967

  
968 968
ENCODER_LIST=$(find_things  encoder  ENC      libavcodec/allcodecs.c)
......
974 974
OUTDEV_LIST=$(find_things   muxer    _MUX     libavdevice/alldevices.c)
975 975
INDEV_LIST=$(find_things    demuxer  DEMUX    libavdevice/alldevices.c)
976 976
PROTOCOL_LIST=$(find_things protocol PROTOCOL libavformat/allformats.c)
977
VIDEO_FILTER_LIST=$(find_things vf_ VF_ libavfilter/allfilters.c)
978
SRC_FILTER_LIST=$(find_things vsrc_ VSRC_ libavfilter/allfilters.c)
979
FILTER_LIST="$SRC_FILTER_LIST $VIDEO_FILTER_LIST"
977
FILTER_LIST=$(find_things   filter   FILTER   libavfilter/allfilters.c)
980 978

  
981 979
enable $ARCH_EXT_LIST \
982 980
       $DECODER_LIST \
......
1071 1069
    --enable-*=*|--disable-*=*)
1072 1070
    eval `echo "$opt" | sed 's/=/-/;s/--/action=/;s/-/ thing=/;s/-/ name=/'`
1073 1071
    case "$thing" in
1074
        encoder|decoder|muxer|demuxer|parser|bsf|protocol) $action ${optval}_${thing} ;;
1075
        filter) $action ${optval} ;;
1072
        encoder|decoder|muxer|demuxer|parser|bsf|protocol|filter) $action ${optval}_${thing} ;;
1076 1073
        *) die_unknown "$opt" ;;
1077 1074
    esac
1078 1075
    ;;
......
1920 1917
echo "postprocessing support    ${pp-no}"
1921 1918
echo "software scaler enabled   ${swscaler-no}"
1922 1919
echo "new filter support        ${avfilter-no}"
1923
echo "filters using lavformat   ${avfilter-lavf-no}"
1920
echo "filters using lavformat   ${avfilter_lavf-no}"
1924 1921
echo "video hooking             ${vhook-no}"
1925 1922
if enabled vhook; then
1926 1923
    echo "Imlib2 support            ${imlib2-no}"
libavfilter/Makefile
7 7
       defaults.o \
8 8
       formats.o \
9 9

  
10
#OBJS-$(CONFIG_VF_XXXX)       += vf_xxx.o
10
#OBJS-$(CONFIG_XXX_FILTER)    += vf_xxx.o
11 11

  
12 12
HEADERS = avfilter.h
13 13

  
libavfilter/allfilters.c
21 21

  
22 22
#include "avfilter.h"
23 23

  
24
#define REGISTER_VF(X,x) { \
25
          extern AVFilter avfilter_vf_##x ; \
26
          if(ENABLE_VF_##X )  avfilter_register(&avfilter_vf_##x ); }
27 24

  
28

  
29
#define REGISTER_VSRC(X,x) { \
30
          extern AVFilter avfilter_vsrc_##x ; \
31
          if(ENABLE_VSRC_##X )  avfilter_register(&avfilter_vsrc_##x ); }
25
#define REGISTER_FILTER(X,x,y) { \
26
          extern AVFilter avfilter_##y##_##x ; \
27
          if(ENABLE_##X##_FILTER )  avfilter_register(&avfilter_##y##_##x ); }
32 28

  
33 29
void avfilter_register_all(void)
34 30
{
......
38 34
        return;
39 35
    initialized = 1;
40 36

  
41
//    REGISTER_VF(CROP,crop);
37
//    REGISTER_FILTER (CROP,crop,vf);
42 38

  
43 39
}

Also available in: Unified diff