Permalink
Browse files

Merge remote-tracking branch 'qatar/master'

* 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>
  • Loading branch information...
2 parents 37e8199 + b3fab1f commit 2581d9bcbb2e45fa1f8538d038099f6e673d9566 @michaelni michaelni committed Nov 3, 2012
Showing with 26 additions and 3 deletions.
  1. +7 −2 doc/Makefile
  2. +14 −0 doc/doxy-wrapper.sh
  3. +3 −1 libavformat/matroskadec.c
  4. +2 −0 library.mak
View
@@ -23,6 +23,7 @@ all-$(CONFIG_DOC): doc
doc: documentation
+apidoc: doc/doxy/html
documentation: $(DOCS)
TEXIDEP = awk '/^@(verbatim)?include/ { printf "$@: $(@D)/%s\n", $$2 }' <$< >$(@:%=%.d)
@@ -53,7 +54,10 @@ doc/%.1: TAG = MAN
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:
@@ -72,7 +76,8 @@ uninstall-man:
clean::
$(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 doc documentation
View
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+SRC_PATH="${1}"
+DOXYFILE="${2}"
+
+shift 2
+
+doxygen - <<EOF
+@INCLUDE = ${DOXYFILE}
+INPUT = $@
+HTML_HEADER = ${SRC_PATH}/doc/doxy/header.html
+HTML_FOOTER = ${SRC_PATH}/doc/doxy/footer.html
+HTML_STYLESHEET = ${SRC_PATH}/doc/doxy/doxy_stylesheet.css
+EOF
@@ -1214,8 +1214,10 @@ static int matroska_merge_packets(AVPacket *out, AVPacket *in)
int ret = av_grow_packet(out, in->size);
if (ret < 0)
return ret;
+
memcpy(out->data + out->size - in->size, in->data, in->size);
- av_destruct_packet(in);
+
+ av_free_packet(in);
av_free(in);
return 0;
}
View
@@ -6,6 +6,8 @@ LIBVERSION := $(lib$(NAME)_VERSION)
LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
INCINSTDIR := $(INCDIR)/lib$(NAME)
+INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)
+
all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME)

0 comments on commit 2581d9b

Please sign in to comment.