Merge commit 'c24469e812501903a46a06eff9722a82e136e841'

* commit 'c24469e812501903a46a06eff9722a82e136e841':
  utils: add workaround for AVHWAccel in ff_get_buffer compat code
  configure: Remove a stray msmpeg4v1 encoder declaration

Conflicts:
libavcodec/utils.c

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

Merge commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d'

* commit '3b2d0ec473b036bdd0a5bc0d896fd5292915f44d':
  configure: Remove the mpegvideo dependency from svq1
  x86: vc1dsp: Fix indentation

Conflicts:
configure

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

Update MAINTAINERS with information about avisynth demuxer.

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

Fix avisynth_context_create constructor error handling.

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

Support pcm_mulaw in Hikvision CCTV mpeg program streams.

Fixes decoding the sample from videolan trac ticket #8344.

Fix a typo in the Monkey's Audio demuxer.

doc: "av* tools" -> "ff* tools".

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

tests/tiny_ssim: include the 2 macros instead of a header

Should fix compilation on open solaris

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

mpegvideo: fix null pointer dereference on switching streams

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

utils: add workaround for AVHWAccel in ff_get_buffer compat code

Since c977039e585bfff28ecc037ef827c6c3d1ed88aa plane count for
PIX_FMT_HWACCEL pixel formats is 0 instead of 1. The created dummy
AVBuffers are still bogus since AVFrame does not hold frame data when
AVHWAccels are used.

mpegvideo/h264: drop period_since_free

This should not be needed anymore

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

tiny_ssim: Avoid "for(int ..."

This should avoid issues with old compilers

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

tools: add tiny_ssim

Taken from:
http://lists.mplayerhq.hu/pipermail/mencoder-users/2006-August/003801.html
and
x264
See: [FFmpeg-devel] [PATCH] tools: add tiny_ssim

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

configure: Remove a stray msmpeg4v1 encoder declaration

No such encoder exists currently.

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

Only test the first frame for missing aac_adtstoasc bistream filter.

Many players ignore broken aac frames, so don't abort mov or flv
muxing when encountering one, just print a warning instead.

Fixes ticket #2380.

mpegtsenc: Only test the first frame for missing h264_mp4toannexb filter.

Many video players accept broken frames in a transport stream, so there
is no reason to abort remuxing when encountering one, just print a
warning instead.

Fixes ticket #1758.

configure: Remove the mpegvideo dependency from svq1

The svq1 decoder can be built standalone without mpegvideo.

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

x86: vc1dsp: Fix indentation

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

configure: mpegvideo should not depend on error resilience

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

configure: the snow encoder is not supposed to depend on error resilience

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Make it possible to compile without error_resilience

Conflicts:
configure
libavcodec/h264.c

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

lavfi/mptestsrc: make use of AV_OPT_TYPE_VIDEO_RATE

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

lavfi/cellauto: make use of AV_OPT_TYPE_VIDEO_RATE

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

lavfi/life: make use of AV_OPT_TYPE_VIDEO_RATE

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

lavfi/mandelbrot: make use of AV_OPT_TYPE_VIDEO_RATE

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

lavfi/testsrc: make use of AV_OPT_TYPE_VIDEO_RATE

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

lavfi/fps: make use of AV_OPT_TYPE_VIDEO_RATE

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

Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0'

* commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0':
  lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo

Conflicts:
libavcodec/h264_parser.c
libavcodec/internal.h
libavcodec/mpeg12.c
libavcodec/utils.c
libavformat/mpegtsenc.c

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

Revert "Fix compilation with --disable-everything --enable-parser=h264."

This reverts commit e0e8c20559d1197868b2620d8d9c560167a8f5d6.

The mpegvideo dependancy should not be needed anymore

Merge commit '75644335b907919057960716508477239c26fed4'

* commit '75644335b907919057960716508477239c26fed4':
  lavc: Move start code finding to utils.c

Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c

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

Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'

* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f':
  ape: 3.80-3.92 decoding support
  h264: Remove an unused variable

Conflicts:
libavcodec/apedec.c
libavformat/ape.c

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

x86/dsputil.asm: make unaligned bswap actually work

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

Merge commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb'

* commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb':
  x86: consistently use unaligned movs in the unaligned bswap

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

h264: Make it possible to compile without error_resilience

Error resilience is enabled by the h264 decoder, unless explicitly
disabled. --disable-everything --enable-decoder=h264 will produce
a h264 decoder with error resilience enabled, while
--disable-everything --enable-decoder=h264 --disable-error-resilience
will produce a h264 decoder with error resilience disabled.

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

lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo

Also move the declaration to internal.h, and add restrict qualifiers
to the declaration (as in the implementation).

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

lavc: Move start code finding to utils.c

This allows dropping the mpegvideo dependency from a number of
components.

This also fixes standalone building of the h264 parser, which
was broken in 64e438697.

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

avcodec/x86/dsputil_qns_template: use av_assert

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

lavfi/perms: add myself to the copyright header.

lavfi/perms: add seed option.

lavfi/perms: remove unecessary indirection after f7324c06.

ffmpeg_opt: avoid strcpy()

This fixes a warning on openbsd and is more robust

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

tools: add audio normalize script example.

lavfi/curves: add forgotten strong_contrast preset.

lavfi/curves: support preset shorthand.

lavfi/curves: add presets support.

Except for the vintage preset, the values are defined by Lou Logan based
on the ones found in Adobe Photoshop CS6.

Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>

ffserver/ctime1: avoid using strcpy()

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

dshow_pin: dont return a value from a void function

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

libpostproc: silence valgrind/fate warning about using uninitialized data

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

ape: 3.80-3.92 decoding support

xxan: make code independent of sizeof(AVFrame)

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

yop: Fix return type

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

h264: Remove an unused variable

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

avcodec/gifdec: Add av_log() to workaround gcc 4.2 miscompiling the code

It appears gcc forgets to increment the byte stream pointer at -O3
I was not able to spot a reason/excuse for it to do that. It
also disappears if the function isnt inlined.

This should fix the gif fate failures on open & free bsd

See: [FFmpeg-devel] [PATCH] gifdec: workaround old gcc 4.2 mis-compiling code

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

xan: make decoder independent of sizeof(AVFrame)

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc/flacdec: Propagate and return meaningful error codes

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

blend: Adding yuvj pixelformats to the blend effect

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sndio_dec: Add missing includes for av_gettime()

no change, as this has already been fixed in FFmpeg

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

x86: consistently use unaligned movs in the unaligned bswap

Fixes fate errors in asv1, ffvhuff and huffyuv on x86_32.

vsrc_testsrc: avoid floats and non bit exactness

The round to zero behavior is maintained, possibly this should
be changed to round to nearest.

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

avcodec/utils: initialize pixel buffer pool

This should silence many valgrind warnings about use of uninitialized
data, all the warnings i looked at where false positives having their
uninitialized data not actually used.

The same effect could be achieved by listing all code that touches
the pixel buffer in the valgrind suppression file.
Note, valgrind also fails to trace the origins correctly.

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

lavf/mux: add the flush_packets option.

Note: a lot of muxers already do the flushing explicitly.

lavfi: support multiple rounds of format negotiation.

Remove the temporary hack for amerge and replace it with a
generic solution.

lavfi/af_amerge: return EAGAIN if the input layouts are not known.

Also downgrade the error to a warning.

lavfi: add test for concat.

h264/field_end move progress report code after error concealment.

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

lavfi/thumbnail: add support for named options.

lavfi/colormatrix: reword error message in init

Change:
"source and destination color space are identical"

which is a true fact, but doesn't tell nothing about what's wrong, to:
"Source and destination color space must not be identical"

which tells more explicitly what the problem is.

lavfi/colormatrix: add support for named options

lavfi/tinterlace: use standard options parsing.

lavfi/subtitles: use standard options parsing.

lavfi/smartblur: use standard options parsing.

lavfi/setfield: use standard options parsing.

lavfi/overlay: use standard options parsing.

lavfi/kerndeint: use standard options parsing.

lavfi/idet: use standard options parsing.

lavfi/histeq: use standard options parsing.

lavfi/gradfun: use standard options parsing.

lavfi/geq: use standard options parsing.

lavfi/fieldorder: use standard options parsing.

lavfi/field: use standard options parsing.

lavfi/deshake: use standard options parsing.

lavfi/cropdetect: use standard options parsing.

lavfi/boxblur: use standard options parsing.

lavfi/blackframe: use standard options parsing.

lavfi/settb: use standard options parsing.

lavfi/select: use standard options parsing.

lavfi/perms: use standard options parsing.

lavfi/sine: use standard options parsing.

lavfi/apad: use standard options parsing.

sndio_dec: Add missing includes for av_gettime()

This is necessary after the old av_gettime in libavformat was
dropped.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Change a missed occurrance of int to ptrdiff_t for strides
  x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function
  bktr: Add missing includes for av_gettime()
  fate: use little endian yuv444p10 in h264-reinit tests

Nothing changes through this merge as the 3 bugfixes already exist
in ffmpeg and the clobbering wraper is still in use as we did not
yet remove avcodec_encode_video

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

x86: Change a missed occurrance of int to ptrdiff_t for strides

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: avoid frame data leak on early frame drop

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

rawdec: fix memleak

Fixes fate-lavf-flm under valgrind

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

avutil/buffer: remove redundant memory poisoning

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

avutil/buffer: support memory poisoning

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

yop: use reget_buffer() as the previous contents are used

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

fate: dont try to filter partial frames with yadif.

The partial frames leak a few uninitialized pixels through
due to incomplete interlaced error concealment support.

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

buffersink/uninit: use av_frame_free() not unref

Fixes memleak

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

x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function

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