Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doxy: Define a group for libswscale documentation

Conflicts:
	libavutil/avutil.h
	libswscale/swscale.h

See: 18d9398143
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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
  *

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);