* commit 'e23f84d9':
  channel_layout: Add a 16channel default layout
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd5eab59a':
  aac: Make sure to set err on the failure path
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '167ea1fb':
  xavs: Do not try to set the bitrate tolerance without a bitrate
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '61d8fa2a':
  h264: Fix faulty call to avpriv_request_sample
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f9ab4fe1':
  h264: Discard currently unsupported registered sei
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '47b447aa':
  imgutils: Fix a typo in avcodec_get_pix_fmt_loss

Not merged, this code was refactored and moved to avutil.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd8ebb615':
  hevcdsp: fix a function name

Not merged, ffmpeg has no function of this name anymore.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'a1926a29':
  hevc: avoid invalid shifts of negative values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '515b69f8':
  checkasm: Explicitly declare function prototypes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e13da244':
  checkasm: x86: properly save rdx/edx in checked_call()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'faa3f17a':
  fate: test only demuxing in asf-repldata
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

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

Works only for flv, h263 and huffyuv decoders.
Makes only one pass through the file (this should be changed to two passes)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Otherwise it is impossible to make '-movflags +rtphint' bitexact after
FF_API_LAVF_BITEXACT has been disabled.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Including libavutil/internal.h breaks compilation of doc/print_options.c
with MSVC due to linking avpriv_strtod/avpriv_snprintf.

This reverts part of commit 095347ff.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

This fixes a -Wabsolute-value reported by clang 3.5+ complaining about misuse of fabs() for integer absolute value.
An additional benefit is the removal of floating point calculations.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Bug-Id: CID 1308153

Avoid a division by zero.

Bug-Id: CID 1257655

FAIL(ret) expands to statements including a silly ret=ret.
This triggers a -Wself-assign on confirmed clang 3.6, and so we fix it.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Move field to internal part of AVStream and struct to internal.h
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes -Wunused-function warnings when compiling with --disable-yasm on x86.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixing it will take a bit longer, so just suspend the test.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Due to segfaults on some platforms, fix will take a bit longer.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Commit 7c72a4bb was slightly wrong
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

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

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

This fixes fate with FF_API_REQUEST_CHANNELS disabled.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

There is no use in an internal group for a public API documentation.