* qatar/master: (27 commits)
  avconv: free packet in write_frame() when discarding due to frame number limit
  FATE: use +/- flag option syntax for vp8 emu-edge tests
  lavf: make av_interleave_packet_per_dts() private.
  lavf: deprecate av_read_packet().
  oggdec: output correct timestamps for Vorbis
  avconv: pass input stream timestamps to audio encoders
  lavc: shrink encoded audio packet size after encoding.
  xa: set correct bit rate
  xa: do not set bit_rate, block_align, or bits_per_coded_sample
  xa: fix end-of-file handling
  xa: fix timestamp calculation
  bink: fix typo in FFALIGN() argument
  bink: align plane width to 8 when calculating bundle sizes
  doc: pass -Idoc texi2html and texi2pod
  doc: texi2pod: add -I flag
  movenc: Add a min_frag_duration option
  rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
  libavformat: Set the default for the max_delay option to -1
  Generate manpages for AV{Format,Codec}Context AVOptions.
  doc/avconv: remove entries for AVOptions.
  ...
Conflicts:
	doc/Makefile
	doc/ffmpeg.texi
	doc/muxers.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/options.c
	libavcodec/vp8.c
	libavformat/options.c
	tests/fate/demux.mak
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
	
		
			
				
	
	
		
			74 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			74 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
 | 
						|
OBJDIRS += 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
 |