Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 13:47:50 +0000 (14:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Nov 2012 13:48:51 +0000 (14:48 +0100)
* qatar/master:
  doc: add apidoc target for doxygen API documentation
  matroskadec: do not use avpacket internals

Conflicts:
doc/Makefile
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/Makefile
libavformat/matroskadec.c
library.mak

diff --cc doc/Makefile
@@@ -6,31 -6,18 +6,32 @@@ HTMLPAGES   = $(PROGS-yes:%=doc/%.html
                doc/fate.html                                             \
                doc/general.html                                          \
                doc/git-howto.html                                        \
 -              doc/libavfilter.html                                      \
                doc/nut.html                                              \
                doc/platform.html                                         \
 +              doc/syntax.html                                           \
  
 -DOCS = $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
 +TXTPAGES    = doc/fate.txt                                              \
  
 -all-$(CONFIG_DOC): documentation
 +
 +DOCS-$(CONFIG_HTMLPAGES) += $(HTMLPAGES)
 +DOCS-$(CONFIG_PODPAGES)  += $(PODPAGES)
 +DOCS-$(CONFIG_MANPAGES)  += $(MANPAGES)
 +DOCS-$(CONFIG_TXTPAGES)  += $(TXTPAGES)
 +DOCS = $(DOCS-yes)
 +
 +all-$(CONFIG_DOC): doc
 +
 +doc: documentation
  
+ apidoc: doc/doxy/html
  documentation: $(DOCS)
  
 -TEXIDEP = awk '/^@include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)
 +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
  
  GENTEXI  = format codec
  GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi)
@@@ -53,11 -40,11 +54,14 @@@ doc/%.1: TAG = MA
  doc/%.1: doc/%.pod $(GENTEXI)
        $(M)pod2man --section=1 --center=" " --release=" " $< > $@
  
- $(DOCS): | doc/
+ $(DOCS) doc/doxy/html: | doc/
+ doc/doxy/html: $(SRC_PATH)/doc/Doxyfile $(INSTHEADERS)
+       $(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
  
 +install-man:
 +
 +ifdef CONFIG_MANPAGES
  install-progs-$(CONFIG_DOC): install-man
  
  install-man: $(MANPAGES)
@@@ -71,8 -57,9 +75,9 @@@ uninstall-man
        $(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
  
  clean::
 -      $(RM) doc/*.html doc/*.pod doc/*.1 $(CLEANSUFFIXES:%=doc/%) doc/avoptions_*.texi
 +      $(RM) $(TXTPAGES) doc/*.html doc/*.pod doc/*.1 $(CLEANSUFFIXES:%=doc/%) doc/avoptions_*.texi
+       $(RM) -r doc/doxy/html
  
  -include $(wildcard $(DOCS:%=%.d))
  
- .PHONY: doc documentation
 -.PHONY: apidoc documentation
++.PHONY: apidoc doc documentation
@@@ -1214,8 -1140,11 +1214,10 @@@ static int matroska_merge_packets(AVPac
      int ret = av_grow_packet(out, in->size);
      if (ret < 0)
          return ret;
 -    memcpy(out->data + old_size, in->data, in->size);
-     av_destruct_packet(in);
 +    memcpy(out->data + out->size - in->size, in->data, in->size);
+     av_free_packet(in);
      av_free(in);
      return 0;
  }
diff --cc library.mak
Simple merge