Merge commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3'

* commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3':
  LICENSE: Move (L)GPLv3 explanation block to a more suitable place
  swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB

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

diff --cc LICENSE
index 88dda17,1074989..14e3e0f
--- 1/LICENSE
--- 2/LICENSE
+++ b/LICENSE
@@@ -1,49 -1,33 +1,54 @@@
 -Libav:
 -======
 +FFmpeg:
  
 -Most files in Libav are under the GNU Lesser General Public License version 2.1
 +Most files in FFmpeg are under the GNU Lesser General Public License version 2.1
  or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other
  files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
 -Libav.
 +FFmpeg.
  
 -Some optional parts of Libav are licensed under the GNU General Public License
 +Some optional parts of FFmpeg are licensed under the GNU General Public License
  version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of
  these parts are used by default, you have to explicitly pass --enable-gpl to
 -configure to activate them. In this case, Libav's license changes to GPL v2+.
 +configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
  
 -Specifically, the GPL parts of Libav are
 +Specifically, the GPL parts of FFmpeg are
  
 +- libpostproc
 +- libmpcodecs
 +- optional x86 optimizations in the files
 +  libavcodec/x86/idct_mmx.c
 +- libutvideo encoding/decoding wrappers in
 +  libavcodec/libutvideo*.cpp
  - the X11 grabber in libavdevice/x11grab.c
 +- the swresample test app in
 +  libswresample/swresample-test.c
  - the texi2pod.pl tool
  - the following filters in libavfilter:
 +    - f_ebur128.c
      - vf_blackframe.c
      - vf_boxblur.c
 +    - vf_colormatrix.c
      - vf_cropdetect.c
 +    - vf_decimate.c
      - vf_delogo.c
 +    - vf_geq.c
 +    - vf_histeq.c
      - vf_hqdn3d.c
 +    - vf_hue.c
 +    - vf_kerndeint.c
 +    - vf_mp.c
 +    - vf_noise.c
 +    - vf_pp.c
 +    - vf_smartblur.c
 +    - vf_super2xsai.c
 +    - vf_tinterlace.c
      - vf_yadif.c
 +    - vsrc_mptestsrc.c
  
+ Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then
+ the configure parameter --enable-version3 will activate this licensing option
+ for you. Read the file COPYING.LGPLv3 or, if you have enabled GPL parts,
+ COPYING.GPLv3 to learn the exact legal terms that apply in this case.
+ 
  There are a handful of files under other licensing terms, namely:
  
  * The files libavcodec/jfdctfst.c, libavcodec/jfdctint_template.c and