ffmpeg: update error message, and make use of av_err2str() to simplify

Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'

* commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e':
  vf_delogo: switch to an AVOptions-based system.

Conflicts:
libavfilter/vf_delogo.c

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

Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'

* commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd':
  vf_cropdetect: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_cropdetect.c

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

Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'

* commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891':
  vf_crop: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_crop.c

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

Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'

* commit '51def31dbe5b6e857536de8fa428f263d64f3ae5':
  vf_boxblur: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_boxblur.c

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

avfilter/blackframe: add "thres" back as alternative

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

avfilter: support alternative keys in the alternative shorthand system

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

Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'

* commit '62dcdb028cc84845fd263bb09304c4c6500bda7a':
  vf_blackframe: switch to an AVOptions-based system.
  vf_aspect: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c

In the aspect filter most changes are merged but not the final
switch to the libav API because that is too restrictive and has
difficulty handling the syntax.

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

Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'

* commit 'e67a87eac814c7805d18c983c43033a8a1bd62af':
  vf_(no)format: switch to an AVOptions-based system.
  af_aformat: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/af_aformat.c

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

Merge commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27'

* commit 'd28cb849899abd98bf2dd72f5a3dd56d441aeb27':
  buffersrc: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/buffersrc.c

Commit not merged, merge left to maintainer.

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

Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'

* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
  af_resample: switch to an AVOptions-based system.

Conflicts:
libavfilter/avfilter.c

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

lavfi/overlay: add process_command callback

lavfi/overlay: add enable expression

This expression is useful to enable/disable overlaying on the fly.

Note that this can't be easily done relying on the filtergraph structure,
since this implies caching issues or a null frame overlaying in the best
case, which is better avoided for performance and convenience reasons.

lavfi/overlay: add dynamic expression evaluation support

Add support for dynamic x, y expressions evaluation.

Also add support for an evaluation mode which allows to disable per-frame
evaluation, so that there is no speedloss in case the expression does not
depend on frame variables.

lavu/eval: rename "new_eval_expr()" to "make_eval_expr()"

The new name is more semantically and stilistically consistent.

Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'

* commit 'b439c992c23f3e0f3832fffd2a34a664b236c525':
  lavfi: switch to an AVOptions-based system.
  dfa: implement missing TDLT coding method

Conflicts:
libavcodec/dfa.c
libavfilter/avfilter.c

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

lavf: add libquvi demuxer.

Replace all occurrences of PRI in sscanf() calls with SCN

Signed-off-by: James Almer <jamrial@gmail.com>

x86: sbrdsp: implement SSE2 qmf_pre_shuffle

From 253 to 51 cycles on Arrandale and Win64.
44 cycles on SandyBridge.

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

lavfi/separatefields: adjust tb to avoid rounding errors.

Since the PTS need double accuracy, the timebase denominator is doubled
as well, and this new time base is used for the timestamp unit.

avformat/avisynth: Cosmetics

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

avformat/avisynth: Fix off-by-one error in avisynth demuxer.

Fixes ticket #2412.

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

separatefields filter

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

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: use a rational for -aspect option.

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

ffmpeg: print frame decoding error statistic

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

ffmpeg: dont exit 0 if fewer than 1/3 of the input could be decoded.

Fixes Ticket2405

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

h264: wait for missing slices only on frames

The EC code does not support fields currently thus it makes no
sense to wait for these cases (which also the check doesnt handle
correctly)

Fixes Ticket 2454

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

lavc/ass: use bprint API in ff_ass_add_rect().

ffmpeg: use a rational for -aspect option.

vf_delogo: switch to an AVOptions-based system.

vf_cropdetect: switch to an AVOptions-based system.

vf_crop: switch to an AVOptions-based system.

vf_boxblur: switch to an AVOptions-based system.

vf_blackframe: switch to an AVOptions-based system.

vf_aspect: switch to an AVOptions-based system.

vf_(no)format: switch to an AVOptions-based system.

af_aformat: switch to an AVOptions-based system.

buffersrc: switch to an AVOptions-based system.

af_resample: switch to an AVOptions-based system.

lavfi: switch to an AVOptions-based system.

dfa: implement missing TDLT coding method

msmpeg4: ignore negative DC overflow

Fixes second half of Ticket2414

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

msmpeg4: fix asm code in ff_msmpeg4_pred_dc()

Fixes first half of Ticket2414

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH
  rtpdec: Increase max rtp packet size to 8192
  lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
  h264pred: Add a few missing const declarations for ff_cropTbl derived pointers

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

srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH

This was missed from 350ad50b - this fixes building the fate-srtp
test.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Increase max rtp packet size to 8192

This fixes connecting to "Ceton InfiniTV4 PCIe & USB".

Signed-off-by: Martin Storsjö <martin@martin.st>

lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500

Signed-off-by: Martin Storsjö <martin@martin.st>

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: simplify video pts calculation
  ffplay: fix indentation
  ffplay: handle audio buffersink output properly with buffering filters
  ffplay: set time_base of audio filter buffer src

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

avfilter/vf_noise: fix build without mmx*inline

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

lavfi: remove noise libmpcodecs wrapper

Native filter have reached similar performance.

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

lavfi/noise: copy inline asm from mp=noise

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

ffplay: simplify video pts calculation

Also use frame->pts instead of a standalone variable

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

ffplay: fix indentation

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

ffplay: handle audio buffersink output properly with buffering filters

Fixes cases when the audio filter generates less or more frames than the input.

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

ffplay: set time_base of audio filter buffer src

Fixes ticket #2408.

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

lavfi: always check return value of ff_get_{audio,video}_buffer()

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

lavfi/mandelbrot: reindent after 51bcd5cd.

h264pred: Add a few missing const declarations for ff_cropTbl derived pointers

The pointers that get assigned ff_cropTbl were made const in
9e0f14f1, but other variables that transitively are assigned
based on these variables were missed.

Signed-off-by: Martin Storsjö <martin@martin.st>

lavfi/mandelbrot: fix speedloss with default config after morphing introduction.

Morphing was introduced in 0d6e5a171 and forced cos/sin computations
with some mult all the time. This commit makes sure these are computed
only when morphing is enabled.

lavf/wavdec: skip padding byte

WAV chunks must be even aligned. This patch skip the extra padding byte
if chunk size is odd.

Fixes ticket #2417.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rtsp: add option to set the socket timeout of the lower protocol.

Fixes Ticket2294

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

avio.h: fix indention

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

lavfi/il: use standard option parsing

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

Merge remote-tracking branch 'mbouron/master'

* mbouron/master:
  lavf/mxfdec: handle identification metadata

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

flvenc: dont call avio_flush() unconditional

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

mux: also call avio_flush() when flushing the muxer

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

avformat: add writeout_count statistic

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables

Conflicts:
libavcodec/mathtables.c

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

Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'

* commit '9e0f14f16cfc9456a691655fda7d01090bffe47e':
  lavc: Make pointers to ff_cropTbl const
  vp3: Embed idct_permutation array directly in VP3DecoderContext

Conflicts:
libavcodec/bit_depth_template.c
libavcodec/vp3.c

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

Merge commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9'

* commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9':
  x86: qpel: Move fullpel and l2 functions to a separate file
  bfin: Make vp3 functions static

Conflicts:
libavcodec/bfin/vp3_bfin.c
libavcodec/x86/Makefile

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

Merge commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5'

* commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5':
  bfin: Don't use the vp3 idct functions if bitexact behaviour is expected

Conflicts:
libavcodec/bfin/vp3_bfin.c

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

lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables

These are widely used throughout libavcodec, nothing dsputil-specific.

Change ff_cropTbl to a statically initialized table, to avoid
initializing it with a function call.

Signed-off-by: Martin Storsjö <martin@martin.st>

lavc: Make pointers to ff_cropTbl const

There's no point in these pointers not being const.

Signed-off-by: Martin Storsjö <martin@martin.st>

x86: qpel: Move fullpel and l2 functions to a separate file

This way, they can be shared between mpeg4qpel and h264qpel without
requiring either one to be compiled unconditionally.

Signed-off-by: Martin Storsjö <martin@martin.st>

vp3: Embed idct_permutation array directly in VP3DecoderContext

This makes the vp3 decoder less dependent on dsputil, and will aid
in making it (eventually) dsputil-independent.

Signed-off-by: Martin Storsjö <martin@martin.st>

bfin: Make vp3 functions static

Signed-off-by: Martin Storsjö <martin@martin.st>

bfin: Don't use the vp3 idct functions if bitexact behaviour is expected

In the non-bitexact mode, vp3 currently decodes to the same
frame crcs as before 28f9ab702 (and the output visually looks
correct).

Signed-off-by: Martin Storsjö <martin@martin.st>

lavf/mxfdec: handle identification metadata

lavfi/histogram: use standard options parsing

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

lavfi/blend,noise: remove unedeed av_opt_free() call

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

x86: sbrdsp: implement SSE qmf_deint_bfly

From 312 to 89/68 (sse/sse2) cycles on Arrandale and Win64.
Sandybridge: 68/47 cycles.

Having a loop counter is a 7 cycle gain.
Unrolling is another 7 cycle gain.
Working in reverse scan is another 6 cycles.

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

dfa: implement tdlt chunk decoding

Sample & pseudo code provided by Vladimir "VAG" Gneushev.

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

ffmpeg: Print a warning when -frames is affecting non video frames

Fixes Ticket2395

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

dpxdec: Fix decoding of RGBA10

Fixes Ticket2392

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

lavc: fix recoded subtitles end.

Text subtitles packets are not 0-terminated (and if they are,
it is handled by the recoding process since 0 is a valid
Unicode code point). The terminating 0 would overwrite the
last payload octet.

OTOH, packets must be 0-padded.

Fix a problem reported in trac ticket #2431.

asfenc: convert asserts to av_assert

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

lavf/http: use a more compatible default user agent.

Fixes Ticket 2265.

vf_noise: Fix av_lfg_get() maximum value

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

vf_noise: remove low quality mode

It produces vissible correlation between lines

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

avfilter/vf_mp: fix x86 cpu caps

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

sbrdsp: unroll and use integer operations

This patch can be controversial, by assuming floats are IEEE-754 and
particular behaviour of the FPU will get in the way.
Timing on Arrandale and Win32 (thus, x87 FPU is used in the reference).

sbr_qmf_pre_shuffle_c: 115 to 76
sbr_neg_odd_64_c: 84 to 55
sbr_qmf_post_shuffle_c: 112 to 83

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

sbrdsp: unroll sbr_autocorrelate_c

1410 cycles to 1148 on Arrandale/Win64.

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

coverage: filter /usr/include out

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: sbrdsp: Implement SSE neg_odd_64

Conflicts:
libavcodec/x86/sbrdsp.asm

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

Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

* commit 'a862c7d3368241e72a465ab944afa38ea62a6640':
  Integrate lcov/gcov into Libav

Conflicts:
Makefile
common.mak

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

fate: add coverage for background disposal in gif decoder

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

doc/filters: fix main/over mismatch in movie examples

Found-By: littlebat <dashing.meng@gmail.com>

x86: sbrdsp: Implement SSE neg_odd_64

Timing on Arrandale:
        C   SSE
Win32:  57   44
Win64:  47   38
Unrolling and not storing mask both save some cycles.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h261: Move mvmap table to the only place it is used

Conflicts:
libavcodec/h261data.h

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

Merge commit '0404ec619d43f27b87c424aa1a572a6699fe6a31'

* commit '0404ec619d43f27b87c424aa1a572a6699fe6a31':
  h261: cosmetics: Move functions to avoid forward declarations

Conflicts:
libavcodec/h261dec.c
libavcodec/h261enc.c

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