Merge commit '998fdcff41bbda8ef13c991743376556f910efa9'

* commit '998fdcff41bbda8ef13c991743376556f910efa9':
  lavc: replace some forgotten instances of PixelFormat with AVPixelFormat
  svq1: unmacroify macros used only once.

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

Merge commit '95baf701db719ecad6b31000429e20eca2526ed6'

* commit '95baf701db719ecad6b31000429e20eca2526ed6':
  svq1: deMpegEncContextize

Conflicts:
libavcodec/svq1dec.c

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

lavfi: drop ff_null_start_frame/end_frame/draw_slice.

The functions have become unused

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

lavfi/select: assign NAN to ignored values

Also log scene value. Improve debugging.

lavfi/select: add support to options

Add options introspection, and improve error feedback.

lavfi/select: in select_frame(), rename picref -> ref

The variable is now used also for audio frames.

doc/filters: itemize select/aselect examples

Improve rendering.

lavfi: mv vf_select.c -> f_select.c

The file now contains also an audio select implementation. Also move the
aselect/select documentation from video filters to the multimedia filters
section.

lavfi: add aselect audio variant of select

lavfi/select: remove deprecated and unused poll_frame() callback

Simplify.

lavf/matroskaenc: use integers to for display size.

Avoid rounding differences between x86_32 and x86_64.
Fix trac ticket #1997.

mpeg1video: fix regression with slices != threads

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

mpeg1video: support multi threaded slice encoding.

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

adpcm: fix off by 1 error and out of array access in DK4

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

msmpeg4dec: fix coeff index

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

read_gab2_sub: fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter_get_audio_buffer_ref_from_frame: check that layout and channels match if they are set

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

ffmpeg: sub2video: use start and end time.

Until now, the end_display_time was ignored, making single
packets subtitles (like dvdsub) stay indefinitely.

start_display_time was also ignored, but is it almost always 0.

ff_copy_buffer_ref: use the channel count

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

avfilter_get_video_buffer_ref_from_frame: check channel count

more than 8 channels is not supported and crashes with null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

alsdec: check block length

Fix writing over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf/concatdec: avoid leaking URLs.

Use av_realloc instead of av_realloc_f to keep the original
array in case of failure: it is freed in full by the fail label.

mxf_set_audio_pts: fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

oggspeexparse: fix array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix segfault due to overlooked change needed in 14758e3
  x86inc: support stack mem allocation and re-alignment in PROLOGUE

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

x86inc: support stack mem allocation and re-alignment in PROLOGUE.

Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).

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

Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'

* commit '14758e3211d34a97c42b07acae117ce5627d7f57':
  lavr: temporarily store custom matrix in AVAudioResampleContext
  lavr: clarify documentation for avresample_get/set_matrix()

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

Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'

* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
  swfdec: cosmetics: fix indentation

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

swfdec: print warning when len is cliped

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

Fix frame-rate documentation.

lavc: replace some forgotten instances of PixelFormat with AVPixelFormat

svq1: unmacroify macros used only once.

svq1: deMpegEncContextize

This decoder is quite simple and none of the MpegEncContext complexity
is actually needed.

Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'

* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
  swfdec: do better validation of tag length
  Make LOCAL_ALIGNED syntactically similar on all systems

Conflicts:
libavformat/swfdec.c

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

lavr: fix segfault due to overlooked change needed in 14758e3

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

x86inc: support stack mem allocation and re-alignment in PROLOGUE

Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).

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

lavfi/showinfo: check plane count before dereferencing.

ac3dec: fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

cafdec: Check duration before use.

Fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bfi: fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Changelog: update for soxr

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

doc/ffmpeg: fix/extend documentation for -copyts

swr: Add SOX resampler support

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

swr: add a lowpass default so that each Resampler can have its own default.

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

swr: move flush into Resampler

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

swr: make realloc_audio() available outside swresample.c

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

swr: Add API to make resample engine selectable.

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

lavc/utils: Do not require dimensions for PNG.

pngenc doesnt need them and mplayer doesnt set them.

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

doc/filters: fix grammar mistake in setfield documentation

Spotted-by: Tim Nicholson <nichot20@yahoo.com>

lavr: temporarily store custom matrix in AVAudioResampleContext

This allows AudioMix to be treated the same way as other conversion contexts
and removes the requirement to allocate it at the same time as the
AVAudioResampleContext.

The current matrix get/set functions are split between the public interface
and AudioMix private functions.

lavr: clarify documentation for avresample_get/set_matrix()

lavfi/fps: remove parse opt error message.

See cc650cf0 for more info.

doc/filters: extend fps documentation.

lavfi/fps: add shorthand.

mxfdec: drop unneeded extradata padding

Found-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swfdec: cosmetics: fix indentation

swfdec: do better validation of tag length

Avoids trying to read a packet with 0 or negative size.
Avoids a potential infinite loop due to seeking backwards.

Partially based on a patch by Michael Niedermayer.

mxfdec: fix leak of extradata

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Make LOCAL_ALIGNED syntactically similar on all systems

This changes the LOCAL_ALIGNED definition on systems where
DECLARE_ALIGNED is used so it matches the manual alignment
case, ensuring invalid use will not compile on x86 only to
fail on everything else.

Signed-off-by: Mans Rullgard <mans@mansr.com>

filters.texi: document more aresample options

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

svq3: fix cast type to be independant of "sizeof(int)"

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

build: fix dca encoder dependencies

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

fate: add BRSTM demuxer test

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

iff decoder: support RGB8 and RGBN

iff demuxer: support RGB8 and RGBN

lavf: remove unneeded pb check

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

astenc: fix assignment vs compare

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

lavf: fix memleak

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix 'clean' target
  ZeroCodec: Flip output

Conflicts:
libavcodec/version.h

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

lavfi: remove mp=denoise3d filter.

hqdn3d was meant to be a more efficient denoise3d filter, is supported
natively, and is faster on my computer thanks to the ASM optimisations.

doc: fix a -map syntax in one command line example.

build: fix prores decoder dependencies.

According to lavc/proresdsp.c, both prores and prores-lgpl decoders need
lavc/x86/proresdsp_init.c:ff_proresdsp_x86_init().

doxy: add ref for lavfi, lpp and lsws.

doxy: fix swr group name

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

Print bpc (for bits per component) with pixel format if it is smaller than expected.

lavf/segment: add reset_timestamps option

The new options reset the timestamps at each new segment, so that the
generated segments will have timestamps starting close to 0.

It is meant to address trac ticket #1425.

opt: fix memleak on error of range_array

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

http: dont null check p, its unneeded

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

vf_tinterlace: default of mode switch is impossible, add assert.

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

libavcodec/x86/mpegvideo: switch to av_assert2

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

itu H.263: Fix handling of PB blocks

This fixes artifacts in Ticket744

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

h264: dont try to allocate scratchpad if linesize is not known

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

build: fix 'clean' target

This fixes removal of TOOLS as well as HOSTPROGS declared in the
top-level Makefile.  The clean target in common.mak needs to be
eval'd since the variables used within are reset for each library.

Signed-off-by: Mans Rullgard <mans@mansr.com>

swfdec: check lens validity

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

ZeroCodec: Flip output

The initial testing of the VFW binary codec was flawed,
likely due to an AviSynth bug.

Re-testing using VirtualDub and various professional editing
applications has revealed it should have been flipped.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

build: update mxf muxer dependencies

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

lavc: fix typo and avrn build dependencies

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

dsputil_mmx: switch to av_assert2()

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

takdec: silence/fix warning for undefined behavior

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

mips: disable ac3 downmix, until its updated to the new data layout.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Remove an outdated todo comment
  rtpdec: Rename a static variable to normal naming conventions
  sh4: dsputil: remove duplicate of ff_gmc_c()

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

mov: parse @PRM and @PRQ metadata tags

These tags describe the product and quicktime library version respectively.
Originate from Adobe Premier, but some other products use them.

codec_desc: AV_CODEC_ID_SMPTE_KLV is data

rtpdec: Remove an outdated todo comment

This comment was added in e309128f, in 2002, and has been brought
along since then more or less unmodified.

The first point of the todo was implemented in dbf30963 in 2006,
the second one is not relevant to rtpdec.c (brought along from
rtp.c in 8eb793c4 in 2008) but would be more relevant to the
rtp muxer, although it isn't a good idea anyway.

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

rtpdec: Rename a static variable to normal naming conventions

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

sh4: dsputil: remove duplicate of ff_gmc_c()

This function is an exact duplicate of the generic one.

Signed-off-by: Mans Rullgard <mans@mansr.com>

ac3dec: fix bugs in direct buffer use.

This fixes potentially exploitable out of array writes.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: remove unused macro WRAPPER8_16
  configure: fix automatic processing of _extralibs in check_deps
  libvpxenc: Support forcing keyframes
  ac3dec: decode directly into output buffers

Conflicts:
libavcodec/ac3dec.c
libavcodec/libvpxenc.c

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

Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'

* commit '30b39164256999efc8d77edc85e2e0b963c24834':
  ac3dec: make downmix() take array of pointers to channel data

Conflicts:
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h

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

Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'

* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
  ac3dec: output planar float only
  svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
  configure: Have protocols select network code instead of depending on it

Conflicts:
libavcodec/svq3.c

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