Merge commit '2157df425bd909854fd4afcec4aa3311d8a3b31b'

* commit '2157df425bd909854fd4afcec4aa3311d8a3b31b':
  hlsenc: Support outputting specific versions

Not merged, the version is auto-selected in ffmpeg based on enabled features.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083'

* commit 'd68705c9756e6558c8e28d90b4c364f25ba72083':
  dnxhddata: Add tables for missing DNx100 profiles

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8'

* commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8':
  dnxhddata: Merge a few duplicated RUN tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc'

* commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc':
  dnxhddata: Group together RUN-related tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1'

* commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1':
  dnxhddata: Merge a few duplicated DC tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec'

* commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec':
  dnxhddata: Group together DC-related tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f'

* commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f':
  dnxhddata: List the reused tables in a comment

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b'

* commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b':
  dnxhddata: Keep a single CID in the table names

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

avformat/oggenc: Check segments_count for headers too

Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806

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

ffmpeg_opt: Add -hwaccels option that lists all supported hwaccels

lavf/mov: Support unusual alac files without frma and alac atoms.

Fixes ticket #4747.

lavc/dnxhdenc: Fix ibias default.

Fixes a regression since a8ab64d2 reported by Rens Dijkshoorn, rens offlinemedia nl.

avfilter: add hstack & vstack filter

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

avfilter/framesync: allocate FFFrameSyncIn internally

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

avfilter/vf_histogram: fix bug in checking pixel format flags

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

avfilter/vf_vectorscope: fix bug in checking pixel format flags

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

configure: do not fork off grep subprocess while testing for whitespace

grep is not necessary for the functionality.
This avoids an unnecessary fork.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/af_aphaser: use the name 's' for the pointer to the private context

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

avfilter/vf_blend: use the name 's' for the pointer to the private context

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

avcodec/vdpau: fix compilation of mpeg1/mpeg4/vc1 decoders when h264 is disabled

Tested-by: wm4 <nfxjfg@googlemail.com>
Tested-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>

avformat/segment: Do not free the filename twice

Bug introduced in 83a508cda5115c61b456aeb227bf770d61010961

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

swscale: Silence an unused variable warning

Also remove a pair of extraneous ifdeffery.

ffmpeg_opt: Add missing comma

matroskaenc: Fix indentation

Found-by: Hendrik Leppkes <h.leppkes@gmail.com>

lavf/http: Fix parsing http request data to not read over '\0'.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>

configure: aac encoder requires lpc

Fixes compilation with --disable-encoders --enable-encoder=aac

hlsenc: Support outputting specific versions

Right now only version 2 and version 3 are supported.

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

checkasm: Fix floating point arguments on 64-bit Windows

avformat/aa: use correct format specifier in sscanf

This demuxer was broken on a large number of platforms due to usage of wrong
format specifier in sscanf. This patch fixes the problem, and also adds some
debug logging to reduce future debugging pain.

lavf/segment: Fix memleak.

Reviewed-by: Stefano Sabatini
Reviewed-by: Ganesh Ajjanagadde

avformat/file: Check for lstat() instead of dirent.h

Fixes build on mingw

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

fate: add tests for vectorscope filter

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

lavf/dnxhd: Autodetect more valid files.

lavf/file: check for dirent.h support

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

lavf/file: implement directory listing callbacks

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

configure: do not fork off grep subprocess in probe_cc

grep is not required for the functionality in this instance.
This avoids an unnecessary fork, and also avoids a duplicated dumpversion call.
Furthermore, it also corrects behavior when no minor version number is present, see e.g
https://github.com/joyent/node/pull/25671.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/mjpegdec: Remove message asking for a non mod 16 AMV sample

Ticket4770 contains such a sample and it decodes fine

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

avfilter/vf_vectorscope: add options with shorter name

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

avfilter/vf_vectorscope: make intensity user configurable

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

dnxhddata: Add tables for missing DNx100 profiles

1440x1080@8 progressive (1259) and interlaced (1260).

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

dnxhddata: Merge a few duplicated RUN tables

dnxhddata: Group together RUN-related tables

This helps in finding duplicates.

dnxhddata: Merge a few duplicated DC tables

dnxhddata: Group together DC-related tables

This helps in finding duplicates.

dnxhddata: List the reused tables in a comment

dnxhddata: Keep a single CID in the table names

Use a comment to list the reused tables, since it's more flexible than a
table name to keep information like this. The list will expand in later
commits.

avformat/hevc: Check num_long_term_ref_pics_sps to avoid potentially long loops

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

avformat/hevc: Fix parsing errors

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

Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'

* commit 'e23f84d9652474353d8bbc42787a56ec1991908f':
  channel_layout: Add a 16channel default layout

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e'

* commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e':
  aac: Make sure to set err on the failure path

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd'

* commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd':
  xavs: Do not try to set the bitrate tolerance without a bitrate

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc'

* commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc':
  h264: Fix faulty call to avpriv_request_sample

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068'

* commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068':
  h264: Discard currently unsupported registered sei

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit '47b447aaff1bc30ba986ca757346a2c5c95b786a'

* commit '47b447aaff1bc30ba986ca757346a2c5c95b786a':
  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>

Merge commit 'd8ebb6157d12183ed3fc987cd2ba18b404758828'

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

Not merged, ffmpeg has no function of this name anymore.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'a1926a29fb4325afa46842883f197c74d4535c36'

* commit 'a1926a29fb4325afa46842883f197c74d4535c36':
  hevc: avoid invalid shifts of negative values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit '515b69f8f8e9a24cfaee95d8c1f63f265d8582fe'

* commit '515b69f8f8e9a24cfaee95d8c1f63f265d8582fe':
  checkasm: Explicitly declare function prototypes

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'e13da244f41610ee073b2f72bcf62b60fa402bb5'

* commit 'e13da244f41610ee073b2f72bcf62b60fa402bb5':
  checkasm: x86: properly save rdx/edx in checked_call()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Merge commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae'

* commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae':
  fate: test only demuxing in asf-repldata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

fate: add tests for waveform filter

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

fate: add api-band-test

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>

rtpenc_chain: also copy AVFMT_FLAG_BITEXACT to new AVFormatContext

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>

options_table: fix compatibility with MSVC

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 095347f.

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

avcodec: remove FF_API_LOWRES around max_lowres

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

swresample/dither: use integer arithmetic

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>

channel_layout: Add a 16channel default layout

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

aac: Make sure to set err on the failure path

Bug-Id: CID 1308153

xavs: Do not try to set the bitrate tolerance without a bitrate

Avoid a division by zero.

Bug-Id: CID 1257655

avdevice/lavfi: fix self assignment warning

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>

avfilter/vf_histogram: levels: support more input pixel formats

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

avformat: Remove use of AVFrac and AVStream->pts

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>

avcodec/x86/mpegaudiodsp: correct asm guards

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>

fate: temporarily disable AAC TNS test

Fixing it will take a bit longer, so just suspend the test.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

aacenc_tns: temporarily disable

Due to segfaults on some platforms, fix will take a bit longer.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

swscale/alphablend: fix pointer cast

Commit 7c72a4bbd3a0ca421c7419abad2fb65aa713dd8b was slightly wrong

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

avfilter: add waveform monitor filter

avfilter/vf_vectorscope: add more pixel formats

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

disable deprecation warnings in deprecated code

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

fate: replace deprecated request_channels with request_channel_layout

This fixes fate with FF_API_REQUEST_CHANNELS disabled.

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

openal-dec: replace av_destruct_packet with av_free_packet

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

add missing FF_API_DESTRUCT_PACKET guards

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

avcodec: Fix `make checkheaders`

doxygen: Remove lavu_internal group

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

git-howto: Various copy edits

ffv1: Add missing ff_ prefixes

vp9dsp: Add missing ff_ prefixes

aacsbr_fixed: Make fixed_{exp,log}_table static const

aacdec_fixed: Make exp2tab static const

fmtconvert: Remove float_interleave*

They were not public or used anywhere.

version: Fix two more typos

Same as cafba99b5146cf10d60ceed4257f6e82380a020e but applied to
lavf and lavu.

aacenc_quantization: replace copysign() with a ternary operator

This commit removes the last thing a Windows environment can
complain about the AAC encoder code. Leftover from an old revision.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

fate: added PNS, TNS and IS tests for the AAC encoder

This commit adds tests for the PNS, TNS and IS functionality
of the encoder.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

aacenc_is: rename struct to follow guidelines

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

acenctab: Fix merge conflict

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

aacenc: Add missing ff_ prefixes

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>

aacenc: Harmonize multiple inclusion guards

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>

aacenctab: Add missing ff_ prefixes

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>

aacenctab: Use FF_ARRAY_ELEMS

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>

avutil/x86/asm: rename REG_SP to REG_sp

REG_SP is defined by Solaris system headers.
This fixes a sea of warnings while building on Solaris:
http://fate.ffmpeg.org/report.cgi?time=20150820233505&slot=x86-opensolaris-gcc4.3

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

h264: Fix faulty call to avpriv_request_sample

Broken in f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068