| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 09:25:44 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 09:25:58 (GMT) |
| commit | 20f75a810c49743683b7e503cbbc1db0a04a8925 (patch) | |
| tree | 6e9c7784ca7fea9bc853cd68ba3a3d92e5dd5c93 | |
| parent | 97200d89b9fccef1b72ea0e0e1d8eff7a5e05f43 (diff) | |
| parent | 006ec64877fb638de4b15ae5fd969e22bd0f60ca (diff) | |
| download | ffmpeg-20f75a810c49743683b7e503cbbc1db0a04a8925.zip ffmpeg-20f75a810c49743683b7e503cbbc1db0a04a8925.tar.gz ffmpeg-20f75a810c49743683b7e503cbbc1db0a04a8925.tar.bz2 | |
Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'
* commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca':
lavr doxy: add version.h to the lavr group
lavc doxy: add avcodec.h to the libavcodec group.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavresample/version.h | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index efb0302..7a0f9e4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -23,7 +23,8 @@ /** * @file - * external API header + * @ingroup libavc + * Libavcodec external API header */ #include <errno.h> diff --git a/libavresample/version.h b/libavresample/version.h index 387d097..3cc4441 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -19,6 +19,12 @@ #ifndef AVRESAMPLE_VERSION_H #define AVRESAMPLE_VERSION_H +/** + * @file + * @ingroup lavr + * Libavresample version macros. + */ + #define LIBAVRESAMPLE_VERSION_MAJOR 1 #define LIBAVRESAMPLE_VERSION_MINOR 1 #define LIBAVRESAMPLE_VERSION_MICRO 0 |