Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616'

* commit '5d6a990c115850326711c2f5be4d9fd33f399616':
  mpegaudioenc: Remove broken integer-only quantization code path

Conflicts:
libavcodec/mpegaudioenc.c

Mostly not merged, the integer code works fine.

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

avformat/electronicarts: check chunksize more completely in probe()

Fixes probetest failure

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

avformat/electronicarts: check chunk size.

Fix infinite loop

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

avformat/dfa: check first frame offset in probe

Fixes probetest failure

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

avformat/bethsoftvid: check 4th header byte in probe

Fixes probetest failure

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

avformat/avr: check channels and bps in probe

Fixes probetest failure

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

avformat/utils: disabled debug code to collect format probing statistics

This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc: delete viterbi.txt

The description has been moved to the FFmpeg wiki:
https://trac.ffmpeg.org/wiki/ViterbiAlgorithm

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

ffmpeg: remove unneeded include "libswscale/swscale.h"

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

avfilter/fade: use FADE_OUT macro.

avfilter/fade: remove a bunch of useless parenthesis.

avfilter/fade: use inlink->frame_count.

avfilter/fade: add color option.

Fixes Ticket #1822.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hwaccel: Simplify ff_find_hwaccel

Conflicts:
libavcodec/mpeg12dec.c

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

mpegaudioenc: Remove broken integer-only quantization code path

avformat/diracdec: check 2 chunks in probe

Fixes probetest failure

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

hwaccel: Simplify ff_find_hwaccel

It is always called by passing fields from an AVCodecContext.

avformat/astdec: increase the score for odd samplerate/channels to max/8

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

avformat/rsd: increase the score for odd samplerate/channels to max/8

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

avformat/lvfdec: increase the score for odd channels to max/8

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

avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions

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

avformat/ape: check version in probe

Fixes probetest failure

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

doc/encoders: fix libfdk-aac "Examples" subsection

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

avcodec/vp8: remove unused webp_decode_frame()

See: libavcodec/webp.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/dv: remove unused variable

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

doc/doxy-wrapper: disable inserting headers and footers

The headers and footers are used to integrate Doxygen into Libav's website.
Fixes the Libav-ish look when doing `make apidoc`.

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

avformat/thp: check fps value during probing

Fixes probetest failure

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

avformat/thp: do not set sample_rate for a video codec

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

vp9: fix mvref finding to adhere to bug in libvpx.

Fixes a particular youtube video that I unfortunately can't share.

libavf/avienc: store language metadata for XSUB streams

Formatted in such a way that DivX certified players can decode it.
Verified on Sony Playstation 3 and Philips DVP3380.

Fixes ticket 2385

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: generate more specific error message in case of inconsistent filtering options

In particular, distinguish if the option was -filter or -filter_script.

Suggested-by: Nicolas George

ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct

Avoid the need for multiple potentially inconsistent access operations,
slightly factorize code.

avformat/dv: consider a header match at byte 0 to count as detection of dv in probe

This reduces the amount of data needed to identify dv

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

mpegts: only calculate stat index when its needed during probe

40% faster probe

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

avformat/mpegts: do not hardcode type used in memset()

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

avformat/dv: about 3 times faster probe

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

build: avoid stdin stall with GNU AS probing.

a758c5e added probing for various tools, such as AS. Unfortunately, GNU
AS is reading stdin with -v, and thus configure is stalled with
configure arguments such as --as=as.

Fixes Ticket #1898.

riff: add VP9 fourcc

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

avformat/mp3dec: 4x faster probing

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

avformat/h261dec: dont accept invalid gobs in probe as valid

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

avformat/h261dec: optimize probe

about 3 times faster

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avienc: drop the vfr flag.

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

ffmpeg: treat avi as VFR in framerate conversion code

It can be debated if avi is vfr or cfr, it can be either depending
on the definition of vfr and cfr.
This commit ensures that avi is treated correctly independent of
the AVFMT_VARIABLE_FPS value.

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

Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'

* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
  metasound: Fix error message argument

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

avformat/mxfdec: optimize probing

about 71 times faster

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

tools/probetest: also print the time the probe functions needed

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

tools/probetest: use named constant for the maximum number of formats

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

avienc: drop the vfr flag.

AVI does not really support vfr properly, only by padding with null
packets.

avcodec/mimic: use av_freep() and reset swap_buf_size

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

avcodec/vmdav: use av_freep() and reset unpack_buffer_size

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

avformat/icodec: reduce score returned on probing

The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0

Fixes probetest failure

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h263dsp: K&R formatting cosmetics

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

Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'

* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
configure
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c

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

avformat/lvfdec: check stream count during probing

Fixes probetest failure

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

metasound: Fix error message argument

Signed-off-by: Diego Biurrun <diego@biurrun.de>

avformat/idcin: check the decompressed frame size during probing

Fixes probetest failure

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

h263dsp: K&R formatting cosmetics

Also remove array element numbering comments.

dsputil: Split off H.263 bits into their own H263DSPContext

avformat/mov: only force parsing for video tracks if stss is empty

Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.

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

libavcodec/dvdsubdec: remove exit() call in debug code

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove #undefs for formerly forbidden system functions

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

avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter()

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

Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'

* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
libavfilter/graphparser.c

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

avfilter/unsharp: added optimized opencl kernels

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix compilation with os2threads

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mpegvideodec: check seq headers more completely during probing

Fixes probetest failure

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

avformat/img2enc: simplify split planes extension selection.

doc/muxers: document animated GIF muxer.

avformat/gif: fix final_delay unit in documentation.

avformat/img2enc: reindent after previous commit.

avformat/image2: allow muxing gif files.

Fixes Ticket #2936.

avfilter/af_aecho: free input frame after it is being used

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

avcodec/libfdk-aacdec: remove redundant log messages

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

avcodec/hnm4video: remove redundant log message

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

avformat/astdec: sanity check channels & sample rate

Fixes probetest failure

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/hls: fixed bug where custom http headers weren't kept for hls streams

See: https://trac.ffmpeg.org/ticket/3024

Remove #undefs for formerly forbidden system functions

The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.

avfilter/af_aresample: Calculate output buffer size more precisely.

Fixes accumulation of data in case of significant silence injections

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

avfilter/graphparser: Directly free filter memory if initialization fails

avformat/segafilm: check 2nd tag

Fixes probetest failure

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

avformat/swfdec: check version and size during probing

Fixes probetest failure

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

avformat/rsd: increase probe score, as misdetections are fixed

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

avformat/rsd: Check channels and sample_rate fields

Fixes probetest failure

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

avformat/libgme: decrease score by 1, fixes probetest failure

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: add smarter method for determining video picture duration
  ffplay: add frame duration estimated from frame rate to VideoPicture
  ffplay: avoid code duplication in AVFILTER enabled and disabled case

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

avutil/common: error out with clear message if __STDC_CONSTANT_MACROS is not defined with c++

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Move -Wno-maybe-uninitialized check into gcc section

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

ffplay: add smarter method for determining video picture duration

- consider it an invalid PTS when the next PTS value is the same as the current one
- in case of invalid or unknown PTS, return vp->duration

This fixes ffplay part of ticket #3005.

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: add frame duration estimated from frame rate to VideoPicture

Signed-off-by: Marton Balint <cus@passwd.hu>

ffplay: avoid code duplication in AVFILTER enabled and disabled case

Signed-off-by: Marton Balint <cus@passwd.hu>

avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3().

1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips
1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips
1864 decicycles in idct_idct_4x4_add_c, 1048548 runs, 28 skips

529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips
516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips
474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 1048565 runs, 11 skips

(~3.9x faster)

7726 decicycles in idct_idct_8x8_add_c, 1048433 runs, 143 skips
7732 decicycles in idct_idct_8x8_add_c, 2096882 runs, 270 skips
7731 decicycles in idct_idct_8x8_add_c, 4193772 runs, 532 skips

1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 1048549 runs, 27 skips
1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 2097097 runs, 55 skips
1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 4194188 runs, 116 skips

(~7.1x faster)

Overall decode time before commit:
  16.48s user 0.03s system 99% cpu 16.526 total
  16.54s user 0.01s system 99% cpu 16.566 total
  16.46s user 0.03s system 99% cpu 16.511 total

Overall decode time after commit:
  16.34s user 0.02s system 99% cpu 16.378 total
  16.28s user 0.02s system 99% cpu 16.315 total
  16.32s user 0.03s system 99% cpu 16.366 total

Tested on i7 920 with 40s 1080p footage.

avfilter/opencl: compile kernels separately

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/opencl: compile kernels separately

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mss2: use init_get_bits8()

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

avcodec/flashsv: use av_freep() for tmpblock

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

avcodec/mss1: use init_get_bits8()

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

lsws/utils: introduce scale_algorithms array

Allow some dumb factorizations, slightly decrease spaghetti factor.

avcodec/flashsv: fix typo

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

avcodec/tscc2: use init_get_bits8()

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

avcodec/brender_pix: stop calling av_image_check_size() twice

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