Browse code

avfilter: Compile FIFO filters unconditionally

Building libavfilter without that functionality makes little sense.

Diego Biurrun authored on 2012/12/18 23:04:48
Showing 2 changed files
... ...
@@ -19,11 +19,11 @@ OBJS = allfilters.o                                                     \
19 19
        buffersink.o                                                     \
20 20
        buffersrc.o                                                      \
21 21
        drawutils.o                                                      \
22
+       fifo.o                                                           \
22 23
        formats.o                                                        \
23 24
        graphparser.o                                                    \
24 25
        video.o                                                          \
25 26
 
26
-OBJS-$(CONFIG_AFIFO_FILTER)                  += fifo.o
27 27
 OBJS-$(CONFIG_AFORMAT_FILTER)                += af_aformat.o
28 28
 OBJS-$(CONFIG_AMIX_FILTER)                   += af_amix.o
29 29
 OBJS-$(CONFIG_ANULL_FILTER)                  += af_anull.o
... ...
@@ -50,7 +50,6 @@ OBJS-$(CONFIG_DRAWBOX_FILTER)                += vf_drawbox.o
50 50
 OBJS-$(CONFIG_DRAWTEXT_FILTER)               += vf_drawtext.o
51 51
 OBJS-$(CONFIG_FADE_FILTER)                   += vf_fade.o
52 52
 OBJS-$(CONFIG_FIELDORDER_FILTER)             += vf_fieldorder.o
53
-OBJS-$(CONFIG_FIFO_FILTER)                   += fifo.o
54 53
 OBJS-$(CONFIG_FORMAT_FILTER)                 += vf_format.o
55 54
 OBJS-$(CONFIG_FPS_FILTER)                    += vf_fps.o
56 55
 OBJS-$(CONFIG_FREI0R_FILTER)                 += vf_frei0r.o
... ...
@@ -35,7 +35,6 @@ void avfilter_register_all(void)
35 35
         return;
36 36
     initialized = 1;
37 37
 
38
-    REGISTER_FILTER (AFIFO,       afifo,       af);
39 38
     REGISTER_FILTER (AFORMAT,     aformat,     af);
40 39
     REGISTER_FILTER (AMIX,        amix,        af);
41 40
     REGISTER_FILTER (ANULL,       anull,       af);
... ...
@@ -62,7 +61,6 @@ void avfilter_register_all(void)
62 62
     REGISTER_FILTER (DRAWTEXT,    drawtext,    vf);
63 63
     REGISTER_FILTER (FADE,        fade,        vf);
64 64
     REGISTER_FILTER (FIELDORDER,  fieldorder,  vf);
65
-    REGISTER_FILTER (FIFO,        fifo,        vf);
66 65
     REGISTER_FILTER (FORMAT,      format,      vf);
67 66
     REGISTER_FILTER (FPS,         fps,         vf);
68 67
     REGISTER_FILTER (FREI0R,      frei0r,      vf);
... ...
@@ -119,4 +117,12 @@ void avfilter_register_all(void)
119 119
         extern AVFilter avfilter_asink_abuffer;
120 120
         avfilter_register(&avfilter_asink_abuffer);
121 121
     }
122
+    {
123
+        extern AVFilter avfilter_af_afifo;
124
+        avfilter_register(&avfilter_af_afifo);
125
+    }
126
+    {
127
+        extern AVFilter avfilter_vf_fifo;
128
+        avfilter_register(&avfilter_vf_fifo);
129
+    }
122 130
 }