* qatar/master:
  asf: only set index_read if the index contained entries.
  cabac: add overread protection to BRANCHLESS_GET_CABAC().
  cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().
  cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().
  cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().
  h264: add overread protection to get_cabac_bypass_sign_x86().
  h264: reindent get_cabac_bypass_sign_x86().
  h264: use struct offsets in get_cabac_bypass_sign_x86().
  h264: fix overreads in cabac reader.
  wmall: fix seeking.
  lagarith: fix buffer overreads.
  dvdec: drop unnecessary dv_tablegen.h #include
  build: fix doc generation errors in parallel builds
  Replace memset(0) by zero initializations.
  faandct: Remove FAAN_POSTSCALE define and related code.
  dvenc: print allowed profiles if the video doesn't conform to any of them.
  avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size.
  FATE: add a test for vp8 with changing frame size.
  fate: add kgv1 fate test.
  oggdec: calculate correct timestamps in Ogg/FLAC
Conflicts:
	libavcodec/4xm.c
	libavcodec/cook.c
	libavcodec/dvdata.c
	libavcodec/dvdsubdec.c
	libavcodec/lagarith.c
	libavcodec/lagarithrac.c
	libavcodec/utils.c
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
	
		
			
				
	
	
		
			73 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			73 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Makefile
		
	
	
	
	
	
MANPAGES    = $(PROGS-yes:%=doc/%.1)
 | 
						|
PODPAGES    = $(PROGS-yes:%=doc/%.pod)
 | 
						|
HTMLPAGES   = $(PROGS-yes:%=doc/%.html)                                 \
 | 
						|
              doc/developer.html                                        \
 | 
						|
              doc/faq.html                                              \
 | 
						|
              doc/fate.html                                             \
 | 
						|
              doc/general.html                                          \
 | 
						|
              doc/git-howto.html                                        \
 | 
						|
              doc/libavfilter.html                                      \
 | 
						|
              doc/platform.html                                         \
 | 
						|
 | 
						|
TXTPAGES    = doc/fate.txt                                              \
 | 
						|
 | 
						|
 | 
						|
DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
 | 
						|
ifdef HAVE_MAKEINFO
 | 
						|
DOCS += $(TXTPAGES)
 | 
						|
endif
 | 
						|
 | 
						|
all-$(CONFIG_DOC): documentation
 | 
						|
 | 
						|
documentation: $(DOCS)
 | 
						|
 | 
						|
TEXIDEP = awk '/^@(verbatim)?include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)
 | 
						|
 | 
						|
doc/%.txt: TAG = TXT
 | 
						|
doc/%.txt: doc/%.texi
 | 
						|
	$(Q)$(TEXIDEP)
 | 
						|
	$(M)makeinfo --force --no-headers -o $@ $< 2>/dev/null
 | 
						|
 | 
						|
doc/print_options.o: libavformat/options_table.h libavcodec/options_table.h
 | 
						|
 | 
						|
GENTEXI  = format codec
 | 
						|
GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
 | 
						|
 | 
						|
$(GENTEXI): TAG = GENTEXI
 | 
						|
$(GENTEXI): doc/avoptions_%.texi: doc/print_options
 | 
						|
	$(M)doc/print_options $* > $@
 | 
						|
 | 
						|
doc/%.html: TAG = HTML
 | 
						|
doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
 | 
						|
	$(Q)$(TEXIDEP)
 | 
						|
	$(M)texi2html -I doc -monolithic --init-file $(SRC_PATH)/doc/t2h.init --output $@ $<
 | 
						|
 | 
						|
doc/%.pod: TAG = POD
 | 
						|
doc/%.pod: doc/%.texi $(GENTEXI)
 | 
						|
	$(Q)$(TEXIDEP)
 | 
						|
	$(M)$(SRC_PATH)/doc/texi2pod.pl -Idoc $< $@
 | 
						|
 | 
						|
doc/%.1: TAG = MAN
 | 
						|
doc/%.1: doc/%.pod $(GENTEXI)
 | 
						|
	$(M)pod2man --section=1 --center=" " --release=" " $< > $@
 | 
						|
 | 
						|
$(DOCS): | doc/
 | 
						|
 | 
						|
install-progs-$(CONFIG_DOC): install-man
 | 
						|
 | 
						|
install-man: $(MANPAGES)
 | 
						|
	$(Q)mkdir -p "$(MANDIR)/man1"
 | 
						|
	$(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
 | 
						|
 | 
						|
uninstall: uninstall-man
 | 
						|
 | 
						|
uninstall-man:
 | 
						|
	$(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
 | 
						|
 | 
						|
clean::
 | 
						|
	$(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 $(CLEANSUFFIXES:%=doc/%) doc/avoptions_*.texi
 | 
						|
 | 
						|
-include $(wildcard $(DOCS:%=%.d))
 | 
						|
 | 
						|
.PHONY: documentation
 |