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

* commit '9ecabd78':
  h264: reset num_reorder_frames if it is invalid

Note, num_reorder_frames is not used in the failure case
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0652e024':
  h264: reset ref count if decoding the slice header fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '98cc9efc':
  h264: prevent two matching fields from being both a short/long ref combination

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

* commit '00dbff4c':
  h264: do not call field_end if we do not have a current picture
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7f0e81db':
  h264: limit allowed pred modes in ff_h264_check_intra_pred_mode() to 3

Conflicts:
	libavcodec/h264.c

See: d6a33f5d
See: 2005fddcMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd1b3fabe':
  h264: reset first_field if frame_start() fails for missing refs

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

* commit '21088111':
  Prepare for 10_alpha2 Release

Conflicts:
	RELEASE

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

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

An invalid VUI is not considered a fatal error, so the SPS containing it
may still be used. Leaving an invalid value of num_reorder_frames there
can result in writing over the bounds of H264Context.delayed_pic.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Otherwise the ER code might try to use some already freed references.

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org