* commit 'b4bb9593':
  ratecontrol: Drop commented out cruft
Merged-by: James Almer <jamrial@gmail.com>

* commit 'd06dfaa5':
  x86: huffyuv: Use EXTERNAL_SSSE3_FAST convenience macro where appropriate
Merged-by: James Almer <jamrial@gmail.com>

* commit '8e9cd81d':
  x86: cpu: Detect Conroe CPUs and their slow shuffle unit
Merged-by: James Almer <jamrial@gmail.com>

* commit '7d7355aa':
  x86: Add SSSE3_SLOW CPU flag and related convenience macros
Merged-by: James Almer <jamrial@gmail.com>

* commit '4efab893':
  x86: Use *_FAST/*_SLOW CPU feature detection macros where appropriate
Merged-by: James Almer <jamrial@gmail.com>

* commit '0a39c9ac':
  x86: hpeldsp: Don't check for bitexact flag when initializing VP3-specific code
Merged-by: James Almer <jamrial@gmail.com>

* commit '95c1df92':
  x86: hpeldsp: Drop unused function parameters
Merged-by: James Almer <jamrial@gmail.com>

* commit 'c3e83ad3':
  x86: hpeldsp: Use EXTERNAL_SSE2_FAST where appropriate
Merged-by: James Almer <jamrial@gmail.com>

* commit '1dfc3cf8':
  x86: hpeldsp: Split off VP3-specific bits into a separate file
Merged-by: James Almer <jamrial@gmail.com>

It seems ive written this thing though i cannot really remember
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '9833a406':
  examples: Properly free AVCodecContext
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '0e0538ae':
  avprobe: Zero the allocated avio buffer memory

This commit is a noop, no such thing exists in ffprobe.
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '5d0f85f1':
  libdc1394: Fill in packet data directly
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'e344e651':
  h264dec: do not call finish_setup() if we have not started a frame

This commit is a noop, see bdbbb8f1Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '76f7e70a':
  h264dec: handle zero-sized NAL units in get_last_needed_nal()

See 641dccc2Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '1f7b4f9a':
  h264dec: make sure not to call finish_setup() more than once per frame

This commit is a noop, see bdbbb8f1Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'da917fcf':
  avconv_dxva2: add a profile check for hevc

This commit is a noop, see a655bc83Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '1ecb63cd':
  hevc: set profile based on the profile compatibility flags if needed

This commit is a noop, see f85cc3bfMerged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'fca3c3b6':
  hevc: Add AVX2 DC IDCT

Mostly noop as we already have that code.

In the ASM, code is merged with the exception of SECTION which is kept
uppercase for consistency with the rest of the codebase.

Still in the ASM, the prototype comment is fixed to honor the '_' added
from the original commit.

idct_dc_proto() is dropped as it's not used anymore here.
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'cc16da75':
  hevc: Add coefficient limiting to speed up IDCT

Noop again as we have these changes already, only random spacing
changes.
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit 'a92fd8a0':
  hevc: Add DC IDCT

Noop, only spacing adjusted.
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '4f247de3':
  hevcdsp_template: Templatize IDCT

This commit is a noop as we already have that code from a previous
commits (see 92cccb7b).

Spacing is adjusted to reduce the diff.
Merged-by: Clément Bœsch <cboesch@gopro.com>

* commit '1bd890ad':
  hevc: Separate adding residual to prediction from IDCT

This commit should be a noop but isn't because of the following renames:

- transform_add  → add_residual
- transform_skip → dequant
- idct_4x4_luma  → transform_4x4_luma
Merged-by: Clément Bœsch <cboesch@gopro.com>

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

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

Fixes ticket #6096.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>

Allows the user to reserve space for the ODML master index. A sufficient
sized master index in the AVI header avoids storing follow-up master
indexes within the 'movi' data later. If the option is omitted or zero
the index size is estimated from output duration and bitrate.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

I wonder how unknown layouts ever worked without this?
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes Ticket6102
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Codec 4 (frame size 98) uses joint stereo per spec and examples.
Also removed an incorrect "align" var which wasn't used anyway (it was overwrittern).

Probably all/only .AT3 of frame size 98 are JS, too.
Signed-off-by: bnnm <bananaman255@gmail.com>

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

"Issue" introduced in 83976e40.

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

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

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