* 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.

This will be useful for allocating edges in the encoders.

* 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.

Add a function to create a rational
and macros for common values.

More consistent with codec docs. Also some minor reorganization of sentences
to fit the new document hierarchy.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Improve consistency with the rest of the documentation.

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

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

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

This should make no difference but the variable will be used in a subsequent commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  h264: check that an IDR NAL only contains I slices
Merged-by: Michael Niedermayer <michaelni@gmx.at>