diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-27 15:02:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-27 15:02:35 +0200 |
| commit | 95760b33e7a4fb06686922e93e8c6b5730e85d3f (patch) | |
| tree | 48f235f3dea0e74791d2ef3cfefe2082ee4a5a58 /doc/Doxyfile | |
| parent | c25e9292ba5b5d4f2ba52004d3593a1dafdfe427 (diff) | |
| parent | 1aa07aa21c4ee39f0ed5fcd33d8259eed74bd3ab (diff) | |
| download | ffmpeg-95760b33e7a4fb06686922e93e8c6b5730e85d3f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: fix tests for 2-arg math functions
doc: git-howto: Clarify comment about pushing series of commits
ivi_common: Drop unused function parameter from decode_band()
cook: Remove some silly Doxygen comments
cook: Remove senseless maybe_reformat_buffer32() function
cook: cosmetics: Better names for joint_decode() function parameters
cook: cosmetics: Better name for ccpl COOKSubpacket member
doxygen: Add av_alloc_size to list of predefined macros
doxygen: Drop some pointless entries from PREDEFINED macros list
h263: avoid memcpys over array bound in motion vector caching for obmc
Conflicts:
configure
doc/git-howto.texi
libavcodec/cook.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/Doxyfile')
| -rw-r--r-- | doc/Doxyfile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/doc/Doxyfile b/doc/Doxyfile index 2627a7e23c..69e9d25c35 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -1373,14 +1373,9 @@ INCLUDE_FILE_PATTERNS = # instead of the = operator. PREDEFINED = "__attribute__(x)=" \ - "RENAME(x)=x ## _TMPL" \ - "DEF(x)=x ## _TMPL" \ - HAVE_AV_CONFIG_H \ - HAVE_MMX \ - HAVE_MMXEXT \ - HAVE_AMD3DNOW \ "DECLARE_ALIGNED(a,t,n)=t n" \ - "offsetof(x,y)=0x42" + "offsetof(x,y)=0x42" \ + av_alloc_size \ # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. |