* commit '0d671ade':
  doc: Use a 3 columns multitable

Conflicts:
	doc/encoders.texi

No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'be59675a':
  doc: Change the multitable rendering in texi2pod

Conflicts:
	doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '59388dac':
  fate: update tests for YVYU422 pixel format

Conflicts:
	tests/ref/fate/filter-pixdesc
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

No change as the fate tests where updated in the merges that changed
the scores
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b6a09ef7':
  rawvideo: Support decoding YVYU422 FourCC

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

* commit '92b099da':
  swscale: support converting YVYU422 pixel format

Conflicts:
	libswscale/input.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8b17243d':
  lavu: Add packed YVYU422 pixel format

Conflicts:
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '46439e15':
  mp2: match twolame default options

Not merged as the change breaks fate, also forcing resampling to specific sample rate
reduces quality, and would be like rescaling every movie to 1080.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '718907cd':
  libtwolame MP2 encoding support

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/libtwolame.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

swscale/utils: scale filter_size in warning so that it can be used as max for the compile time define
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Make the html output much nicer.

Makes it working better for our documentation purposes.

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

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

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

Avoids a warning with gcc 4.7 and -Wtype-limits. Albeit
superfluous (At least gcc 4.8 didnt consider this been
a problem).
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

swscale/swscale_internal: make the offset strings update themselfs when the MAX_FILTER_SIZE is changed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

* cehoyos/master:
  Fix compilation with --disable-everything --enable-decoder=rawvideo.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1197065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Related to CID1197063

The limit choosen is arbitrary and much larger than what makes sense.
It avoids the need for checking arithmetic operations with the length for overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

* qatar/master:
  libxvid: fix missing end of line character

Conflicts:
	libavcodec/libxvid.c

No change as the buggy modification wasnt merged, ffmpeg handles the
case where both lumi and variance masking are set, differently
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3536.