diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 16:03:25 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 16:09:30 +0400 |
| commit | 688c3d944de3828e9cf577f809a9a4b78237247c (patch) | |
| tree | 5ab214076277df3c7daf11cc3448e3432448c985 | |
| parent | f5013913da3691121df74c7d57a517c1ca279c53 (diff) | |
| parent | c85aad9cb2af459e8306871f76722de440c3ca93 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxy: Define a group for libswscale documentation
Conflicts:
libavutil/avutil.h
libswscale/swscale.h
See: 18d9398143ac63915e85d76447dca5c9670ed58a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/avutil.h | 2 | ||||
| -rw-r--r-- | libswscale/swscale.h | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 4e680ed0e0..5ebda5ed6f 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -41,7 +41,7 @@ * @li @ref lavu "libavutil" common utility library * @li @ref lswr "libswresample" audio resampling, format conversion and mixing * @li @ref lpp "libpostproc" post processing library - * @li @ref lsws "libswscale" color conversion and scaling library + * @li @ref libsws "libswscale" color conversion and scaling library * * @section ffmpeg_versioning Versioning and compatibility * diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 42702b7aa2..25c8b5e981 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -23,15 +23,10 @@ /** * @file - * @ingroup lsws + * @ingroup libsws * external API header */ -/** - * @defgroup lsws Libswscale - * @{ - */ - #include <stdint.h> #include "libavutil/avutil.h" @@ -40,6 +35,9 @@ #include "version.h" /** + * @defgroup libsws Color conversion and scaling + * @{ + * * Return the LIBSWSCALE_VERSION_INT constant. */ unsigned swscale_version(void); |