avconv: split configuring filter configuration to a separate file.

fe2147e9 · Anton Khirnov · f5e66827 · fe2147e9 · fe2147e9 · fe2147e9
Commit fe2147e9 authored Aug 02, 2012 by Anton Khirnov
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 563 additions and 530 deletions

Makefile Makefile +1 -1

avconv.c avconv.c +0 -529

avconv.h avconv.h +2 -0

avconv_filter.c avconv_filter.c +560 -0

No files found.
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ PROGS-$(CONFIG_AVSERVER) += avserver

 PROGS      := $(PROGS-yes:%=%$(EXESUF))
 OBJS        = cmdutils.o
-OBJS-avconv = avconv_opt.o
+OBJS-avconv = avconv_opt.o avconv_filter.o
 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
 HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
 TOOLS       = qt-faststart trasher

--- a/avconv.c
+++ b/avconv.c
--- a/avconv.h
+++ b/avconv.h
@@ -356,5 +356,7 @@ int guess_input_channel_layout(InputStream *ist);

 int configure_filtergraph(FilterGraph *fg);
 int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out);
+int ist_in_filtergraph(FilterGraph *fg, InputStream *ist);
+FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost);

 #endif /* AVCONV_H */
--- a/avconv_filter.c
+++ b/avconv_filter.c