[FFmpeg-devel] [PATCH 1/2] doc: do not generate doc/avoptions_(codecs|formats).texi

Stefano Sabatini stefasab at gmail.com
Mon Sep 9 09:56:08 CEST 2013


On date Sunday 2013-09-08 15:36:54 -0700, Timothy Gu encoded:
> The contents of the two files have been hardcoded to codecs.texi and
> formats.texi, so there is no use for generating the two files during build
> time.
> 
> Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
> ---
> After this patch is applied, the print_options utility is unused. Whether to
> delete the utility is a RfC.
> ---
> 
>  .gitignore   | 2 --
>  doc/Makefile | 7 -------
>  2 files changed, 9 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 1f13ec4..807ecb1 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -33,8 +33,6 @@
>  /doc/*.html
>  /doc/*.pod
>  /doc/config.texi
> -/doc/avoptions_codec.texi
> -/doc/avoptions_format.texi
>  /doc/examples/decoding_encoding
>  /doc/examples/demuxing
>  /doc/examples/filtering_audio
> diff --git a/doc/Makefile b/doc/Makefile
> index 7415899..cfd2ca5 100644
> --- a/doc/Makefile
> +++ b/doc/Makefile
> @@ -50,13 +50,6 @@ doc/%.txt: doc/%.texi
>  	$(Q)$(TEXIDEP)
>  	$(M)makeinfo --force --no-headers -o $@ $< 2>/dev/null
>  
> -GENTEXI  = format codec
> -GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
> -
> -$(GENTEXI): TAG = GENTEXI
> -$(GENTEXI): doc/avoptions_%.texi: doc/print_options$(HOSTEXESUF)
> -	$(M)doc/print_options $* > $@
> -
>  doc/%.html: TAG = HTML
>  doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
>  	$(Q)$(TEXIDEP)

I suppose it's OK. I suggest to keep the generating program for
easing merges.
-- 
FFmpeg = Fast and Fiendish MultiPurpose Extended Gospel


More information about the ffmpeg-devel mailing list