* cehoyos/master:
  Avoid a possible overflow when reading Nikon avi files.
  Add h263dsp dependency to mpeg1video and mpeg2video encoders.
  Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().

Conflicts:
	doc/APIchanges
	libavcodec/utils.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array accesses with CODEC_FLAG_EMU_EDGE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Prevents out of array accesses with CODEC_FLAG_EMU_EDGE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/diracdec: allocate edges internally instead of depending on CODEC_FLAG_EMU_EDGE being not set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '024db249':
  mpegvideo: allocate edges when encoding.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

We currently read a whole 16x16 block from the input at a few places
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f7e85ee9':
  lavc: allow the caller to override dimensions in ff_get_buffer()

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

More consistent and more future-proof.

Also log output packet information.

Show how to perform streamcopy from one container to another.

Allocating edges will be removed from generic code, so the encoder must
handle this explicitly.

This will be useful for allocating edges in the encoders.

Suggested-by: Reimar

Fixes compilation with:
configure --disable-everything --enable-encoder=mpeg2video --disable-asm

* cehoyos/master:
  Allow decoding of slightly broken Nikon avi files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This also fixes masking the bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3330.

mb_layout is either zero or non-zero.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  eac3: cosmetics, re-indent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ade75fb8':
  (e)ac3: clip surround mix level indexes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c229f571':
  (e)ac3: parse and store the Lt/Rt and LFE mix levels.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1f604f96':
  ac3: set default matrix encoding modes in parse_frame_header.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Values 0-2 are reserved, 3 (-1.5dB) should be used instead.

Deduplicates some code.

Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cigaes/master:
  lavfi/dualinput: fix shortest option.
  lavfi/vf_tile: use av_make_q.
  lavfi/avf_concat: use av_make_q.
  lavfi/af_amerge: use av_make_q.
  lavu/rational: add syntactic sugar.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket 3245

Fix trac ticket #3315.