* qatar/master:
  mpegvideo: increase edge_emu_buffer size for VC1
  lavc: merge latest x86inc.asm fixes with x264

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

* commit 'acb571c8':
  avcodec: bump minor for adaptive h264 frame-mt
  avconv: pass the actually selected decoder to filter_codec_opts().

Conflicts:
	Changelog
	ffmpeg_opt.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The old implementation is no longer possibly due to limitations
of the new command line parser.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '77bd1bc7':
  avconv: use new options parser.

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0ec1642b':
  cmdutils: don't log an error in opt_default().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8c9af5b2':
  cmdutils: add a commandline pre-parser.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a01c02bc':
  cmdutils: split parse_option().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '10bca661':
  cmdutils: add a macro to simplify grow_array() calls.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge only for metadata, functionality had been previously integrated.

* commit '9e696d2e':
  h264: support frame parameter changes during frame-mt

Conflicts:
	libavcodec/h264.c
Merged-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>

Based on code by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

prevents regressions from h264-mt frame size changing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avoids regression from the h264-mt frame size change code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Based on a patch by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Based on patch by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* commit 'f1d8763a':
  mpegvideo: allocate scratch buffers after linesize is known

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

* commit 'ed2d7d58':
  ff_h264_direct_ref_list_init: fix B slice check.
  h264: increase dist_scale_factor for up to 32 references
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '523c7bd2':
  misc typo, style and wording fixes

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

It's confusing and not necessary, especially in the introduction.

In particular, make "See Also" chapter rendered in HTML output.

In particular, make "See Also" chapter rendered in HTML output.

Add more references, and generate alternative variants for HTML and POD
output. In particular, this allows to render a "See Also" chapter in the
HTML output.

Fix syntax, remove pointless introductory sentence, improve overall
consistency.

Factorize.

Ignore @c man begin ... @c man end comments, rely on @chapter for marking
the beginning of the various manual top level sections.

This allows us to write markup which is not dependent on the specific
texi2pod.pl implementation.

This change causes a few rendering issues, which will be fixed in further
patches.

The VC1 decoder uses edge_emu_buffer simultaneously for luma and chroma
and needs more space. That was not a problem before f1d8763a
since the size for edge_emu_buffer was always calculated with 2 byte per
pixel since the linesize was not known.

Fixes occasionally fate errors in vc1_sa10143.

Unbreak NASM support.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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