summaryrefslogtreecommitdiff
authorDiego Biurrun <diego@biurrun.de>2012-10-22 14:01:18 (GMT)
committer Diego Biurrun <diego@biurrun.de>2012-10-23 18:25:30 (GMT)
commitd7a39b33407927005f65755b8a3a608394aaeccd (patch)
tree6bdfefe06a750aa8cf2bc82057a8f289243f05a5
parenta153e45b953dee5b065939300d3a591772f43b19 (diff)
downloadffmpeg-d7a39b33407927005f65755b8a3a608394aaeccd.zip
ffmpeg-d7a39b33407927005f65755b8a3a608394aaeccd.tar.gz
ffmpeg-d7a39b33407927005f65755b8a3a608394aaeccd.tar.bz2
doxygen: Build Doxygen documentation in the doc/ subdirectory
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--Doxyfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 8589127..3ed55b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,8 +28,8 @@
/doc/*.pod
/doc/avoptions_codec.texi
/doc/avoptions_format.texi
+/doc/doxy/html/
/doc/print_options
-/doxy/
/libavcodec/*_tablegen
/libavcodec/*_tables.c
/libavcodec/*_tables.h
diff --git a/Doxyfile b/Doxyfile
index 8e0dcf3..1b4e7d5 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -44,7 +44,7 @@ PROJECT_LOGO =
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = doxy
+OUTPUT_DIRECTORY = doc/doxy
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output