On Sat, 04 Aug 2012 12:11:49 +0100, Måns Rullgård <[email protected]> wrote: > Anton Khirnov <[email protected]> writes: > > > --- > > Makefile | 2 +- > > avconv.c | 530 --------------------------------------------------- > > avconv.h | 2 + > > avconv_filter.c | 562 > > +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > 4 files changed, 565 insertions(+), 531 deletions(-) > > create mode 100644 avconv_filter.c > > > > diff --git a/Makefile b/Makefile > > index 4a86654..77d5399 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -82,7 +82,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset) > > > > SKIPHEADERS = cmdutils_common_opts.h > > > > -OBJS-avconv = avconv_opt.o > > +OBJS-avconv = avconv_opt.o avconv_filter.o > > > > $(foreach P,$(BASENAMES),$(eval $(P)$(EXESUF): $(OBJS-$(P)))) > > $(foreach P,$(BASENAMES),$(eval OBJS += $(OBJS-$(P)))) > > diff --git a/avconv.c b/avconv.c > > index 9e77842..5a72512 100644 > > --- a/avconv.c > > +++ b/avconv.c > > @@ -111,536 +111,6 @@ int nb_output_files = 0; > > FilterGraph **filtergraphs; > > int nb_filtergraphs; > > > > -/** > > - * Define a function for building a string containing a list of > > - * allowed formats, > > - */ > > -#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name, > > separator) \ > > -static char *choose_ ## var ## s(OutputStream *ost) > > \ > > -{ > > \ > > - if (ost->st->codec->var != none) { > > \ > > - get_name(ost->st->codec->var); > > \ > > - return av_strdup(name); > > \ > > Please remove some whitespace from these lines. They are the most > annoying length possible (81 chars). >
ok, done locally. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
