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>

diff --cc libavutil/avutil.h
index 4e680ed,782284d..5ebda5e
--- 1/libavutil/avutil.h
--- 2/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@@ -39,13 -39,12 +39,13 @@@
   * @li @ref libavf "libavformat" I/O and muxing/demuxing library
   * @li @ref lavd "libavdevice" special devices muxing/demuxing library
   * @li @ref lavu "libavutil" common utility library
 - * @li @ref lavr "libavresample" audio resampling, format conversion and mixing
 - * @li @ref libsws "libswscale"  color conversion and scaling 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 libav_versioning Versioning and compatibility
 + * @section ffmpeg_versioning Versioning and compatibility
   *
 - * Each of the Libav libraries contains a version.h header, which defines a
 + * Each of the FFmpeg libraries contains a version.h header, which defines a
   * major, minor and micro version number with the
   * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
   * number is incremented with backward incompatible changes - e.g. removing

diff --cc libswscale/swscale.h
index 42702b7,8fe27df..25c8b5e
--- 1/libswscale/swscale.h
--- 2/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@@ -23,15 -23,11 +23,10 @@@
  
  /**
   * @file
-  * @ingroup lsws
+  * @ingroup libsws
 - * @brief
 - *     external api for the swscale stuff
 + * external API header
   */
  
- /**
-  * @defgroup lsws Libswscale
-  * @{
-  */
- 
  #include <stdint.h>
  
  #include "libavutil/avutil.h"