lavc/qsvdec: expose frame pic_type and key_frame

[ffmpeg] / doc / Makefile

diff --git a/doc/Makefile b/doc/Makefile
index cf3fbab0a2e5fede7a4e604e76bc7997d6e8ecaf..381eca9c01b47afc7e0890dcce6c7a20b5671697 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,7 +1,8 @@
 ALLMANPAGES = $(AVBASENAMES:%=%.1)
 MANPAGES    = $(AVPROGS-yes:%=doc/%.1)
 PODPAGES    = $(AVPROGS-yes:%=doc/%.pod)
-HTMLPAGES   = $(AVPROGS-yes:%=doc/%.html)                               \
+PROGSHTML   = $(AVPROGS-yes:%=doc/%.html)
+HTMLPAGES   = $(PROGSHTML)                                              \
               doc/developer.html                                        \
               doc/faq.html                                              \
               doc/fate.html                                             \
@@ -15,47 +16,37 @@ DOCS-$(CONFIG_POD2MAN)                          += $(MANPAGES) $(PODPAGES)
 DOCS-$(CONFIG_TEXI2HTML)                        += $(HTMLPAGES)
 DOCS = $(DOCS-yes)
 
-DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE)           += output
-DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE)    += transcode_aac
-ALL_DOC_EXAMPLES = output transcode_aac
-
-DOC_EXAMPLES     := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
-ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(EXESUF))
-PROGS            += $(DOC_EXAMPLES)
-
 all: $(DOCS)
 
 apidoc: doc/doxy/html
 documentation: $(DOCS)
 
-examples: $(DOC_EXAMPLES)
-
 TEXIDEP = awk '/^@include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)
 
 GENTEXI  = format codec
 GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
 
+$(MANPAGES) $(PODPAGES) $(PROGSHTML): $(GENTEXI)
+
 $(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)
+doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init
        $(Q)$(TEXIDEP)
        $(M)texi2html -I doc -monolithic --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
 
 doc/%.pod: TAG = POD
-doc/%.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl $(GENTEXI)
+doc/%.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl
        $(Q)$(TEXIDEP)
        $(M)$(SRC_PATH)/doc/texi2pod.pl -Idoc $< $@
 
 doc/%.1: TAG = MAN
-doc/%.1: doc/%.pod $(GENTEXI)
+doc/%.1: doc/%.pod
        $(M)pod2man --section=1 --center=" " --release=" " $< > $@
 
 $(DOCS) doc/doxy/html: | doc/
-$(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples
-OBJDIRS += doc/examples
 
 DOXY_INPUT      = $(addprefix $(SRC_PATH)/, $(INSTHEADERS))
 DOXY_TEMPLATES  = doxy_stylesheet.css footer.html header.html
@@ -84,8 +75,7 @@ uninstall-man:
        $(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 
 clean::
-       $(RM) $(ALL_DOC_EXAMPLES)
-       $(RM) $(CLEANSUFFIXES:%=doc/%) $(CLEANSUFFIXES:%=doc/examples/%)
+       $(RM) $(CLEANSUFFIXES:%=doc/%)
        $(RM) doc/*.html doc/*.pod doc/*.1 doc/avoptions_*.texi
        $(RM) -r doc/doxy/html