Merge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3'

* commit '44127546b0a81dc9dd6190739a62d48f0044c6f3':
  Check if an mp3 header is using a reserved sample rate.

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

Check if an mp3 header is using a reserved sample rate.

Fixes an invalid read past the end of avpriv_mpa_freq_tab.
Fixes divide-by-zero due to sample_rate being set to 0.

Bug-Id: 705

CC:libav-stable@libav.org

x86/dsputil: remove redundant global motion compensation code

The SSE version has been no different than the mmx one since commit a41bf09d

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/apedec: optimize sign combination

48078630 -> 32533850 dezi cycles

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

Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'

* commit '463a7cde563fd805864c48a76dd1b03fc24671ed':
  Differentiate assembler and assembly in documentation and comments

Conflicts:
configure
doc/platform.texi

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

Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'

* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e':
  libx264: Correctly manage constant rate factor params

Conflicts:
libavcodec/libx264.c

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

Merge commit '73953df71a28e94d8959facba7906cf5975ca4ef'

* commit '73953df71a28e94d8959facba7906cf5975ca4ef':
  Replace av_malloc() and memset(0) by av_mallocz()

Conflicts:
libavformat/matroskadec.c
libavformat/rmdec.c
libavformat/utils.c

No change, as none of the split malloc+memset existed in ffmpeg

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

Merge commit 'f83896abda1e78ebbbda0f184b682b4fabadc682'

* commit 'f83896abda1e78ebbbda0f184b682b4fabadc682':
  ape: Replace memset(0) by zero initialization

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

Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'

* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
  mpeg: Mark ff_mpeg_set_erpic() static

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

Merge commit 'a6a675a79287565c3c23455439b114676b63a96c'

* commit 'a6a675a79287565c3c23455439b114676b63a96c':
  configure: Drop stray error resilience dependencies

Conflicts:
configure

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

Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'

* commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0':
  build: Record explicit dependency of intrax8 on error resilience

Conflicts:
configure

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

Merge commit 'c54e118722cbbdc04945538d1796d4472a1ff406'

* commit 'c54e118722cbbdc04945538d1796d4472a1ff406':
  build: Have the eatqi decoder depend on the MPEG-1 decoder

Conflicts:
configure

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

Merge commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd'

* commit '85d805d5cccb2f57e7f2e2254d7a870f05926cfd':
  build: Add missing object files for webm muxer

Conflicts:
libavformat/Makefile

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

Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9'

* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9':
  build: Add missing object files for Matroska demuxer

Conflicts:
libavcodec/Makefile
libavformat/Makefile

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

Merge commit '49470b9404583ab3aff6835f78a759349d331696'

* commit '49470b9404583ab3aff6835f78a759349d331696':
  build: Add missing replaygain object file for CAF demuxer

Conflicts:
libavformat/Makefile

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

ffmpeg: fix reinitializing with threads while flushing

With threads the decoder has a delay and will thus have multiple
frames at EOF left in its buffers which will be returned when flushing
the decoder. The code that extracts such frames from the decoder at the
end does not pull frames from the filtergraph, thus when one of these
frames causes the filtergraph to be reinited, the frames still inside
the graph at that point re lost

This commit changes the flushing to be more similar to normal decoding
and 1 frame at a time

Fixes hqx fate with threads

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

Differentiate assembler and assembly in documentation and comments

The language and the program that consumes the language are not the same.

ffmpeg: fix transcoding dvbsub to dvbsub

fix ticket #2024

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

avcodec/dvbsubdec: support returning exact end times

fixess part of ticket #2024

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

libx264: Correctly manage constant rate factor params

By default they are set to -1.

avfilter/vf_blend: fix macro ()

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

avfilter/unsharp_opencl: fix macro ()

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

x86/audiodsp: move asm code out of dsputil

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

drawtext: drop unused draw_glyphs() arg "rgbcolor"

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

Replace av_malloc() and memset(0) by av_mallocz()

ape: Replace memset(0) by zero initialization

Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'

* commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2':
  dsputil: Split audio operations off into a separate context

Conflicts:
configure
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

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

mpeg: Mark ff_mpeg_set_erpic() static

It is not used outside of the file.

configure: Drop stray error resilience dependencies

build: Record explicit dependency of intrax8 on error resilience

build: Have the eatqi decoder depend on the MPEG-1 decoder

eatqi uses more than just the shared mpegvideo bits.

build: Add missing object files for webm muxer

build: Add missing object files for Matroska demuxer

build: Add missing replaygain object file for CAF demuxer

dsputil: Split audio operations off into a separate context

swr: remove another forgotten division in DSP function.

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

avfilter/vf_hqx: remove << 0

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

fate/filter-video: fix hqx on big endian part 2

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

avfilter/vf_hqx: partly fix big endian fate test

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

swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding

This avoids reading uninitialized bytes and confusing valgrind

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

swscale/x86/input: prevent RGB32_TO_UV_FN from reading into the padding

This avoids reading uninitialized bytes and confusing valgrind

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

avfilter/deshake_opencl: fix macro ()

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

avfilter/avf_showspectrum: fix macro ()

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

avfilter/hqx: add some self promotion in doxy.

This is useful to understand how it's different from the original code.

avfilter/hqx: unroll the pattern calculation

Code si smaller, no speed difference.

avformat/flvdec: give live_flvdec a separate name

This should fix a infinite loop on freebsd

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

Show duration for large asf files as written in the file header.

Fixes ticket #3428.

Do not show libzvbi in the configure output if it was not enabled.

It is already shown in the list of external libraries if it was enabled.

avfilter: add hqx filter (hq2x, hq3x, hq4x)

Partially fixes Ticket #3404 (xbr filter remaining)

avcodec/libtwolame: fix encoding lsf with defaults

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

avcodec/bitstream: document the double volatile

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

ffmpeg: fix memleak and corruption of AVSubtitle with multiple outputs

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

build: Add missing object file for Matroska demuxer

Fixes compilation with --disable-everything --disable-network --enable-demuxer=matroska

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

avcodec/ituh263enc: fix advanced intra coding

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

Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'

* commit 'ca1e36a8e4cd416142487071dbca734567bdaddf':
  h264: fix build when error resilience is disabled

Conflicts:
libavcodec/h264_picture.c

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

avcodec/utils: check sar only when width/height are set

This fixes loosing the perfectly valid SAR when width=height=0

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

Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'

* commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2':
  Add av_image_check_sar() and use it to validate SAR

Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/ffv1dec.c
libavcodec/utils.c
libavutil/version.h

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

avcodec/bitstream: try to workaround internal compiler bug in gcc 4.2

gcc 4.2 seems not maintained anymore so theres no option besides
just working around it.

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

avcodec/x86/rv40dsp_init: fix () in macros

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

avcodec/wavpackenc: fix () in macros

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

fix several typos

h264: fix build when error resilience is disabled

Merge commit 'd349afb07bacccb62eb5369c38d6406d2909d792'

* commit 'd349afb07bacccb62eb5369c38d6406d2909d792':
  dv: cosmetics, reindent

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

Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'

* commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f':
  dv: get rid of global non-const tables

Conflicts:
libavcodec/dv_profile.h
libavcodec/dvdec.c
libavcodec/dvenc.c

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

Merge commit '778111592bf5f38630858ee6dfcfd097cd6c6da9'

* commit '778111592bf5f38630858ee6dfcfd097cd6c6da9':
  dvenc: initialize the profile only once, at init

Conflicts:
libavcodec/dvenc.c

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

Merge commit '452860d7e056f9a894cac2fe52cdedeae4c38251'

* commit '452860d7e056f9a894cac2fe52cdedeae4c38251':
  Use av_packet_rescale_ts() to simplify code.

Conflicts:
doc/examples/muxing.c
ffmpeg.c

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

Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'

* commit '874390e163427c1fe7682ab27924a7843780dbb3':
  lavc: add a convenience function for rescaling timestamps in a packet

Conflicts:
libavcodec/version.h

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

Add av_image_check_sar() and use it to validate SAR

configure: remove superfluous check for AVX/FMA3 support in Yasm

The minimum Yasm/NASM version required to compile ffmpeg supports both
instruction sets

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc: remove RELEASE_NOTES

It hasn't been used since 0.11, and it does not contain any useful
information except for the code name.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dv: cosmetics, reindent

dv: get rid of global non-const tables

Instead, store them in the context and compute on each parameter change.

dvenc: initialize the profile only once, at init

We do not allow the frame parameters to change during encoding, so there
is no need to do this for each frame.

Use av_packet_rescale_ts() to simplify code.

lavc: add a convenience function for rescaling timestamps in a packet

lavc/h264_slice: clarify informational message in case of disabled slice multi-threaded decoding

Also suggest what can be done to workaround the limitation.

doc/codecs: extend documentation for thread_type option

Based on avcodec.h documentation.

tests/fate.sh: report different status for different errors

The order of error codes will be useful in my future fateserver patches.

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

Merge commit '440842c4eb1d7709654ec97cd687663d11ef499c'

* commit '440842c4eb1d7709654ec97cd687663d11ef499c':
  stereo3d: add missing include guards

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

stereo3d: add missing include guards

alpha/blockdsp: move clear_blocks out of dsputil

The blockdsp split did not cover Alpha optimizations

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/utils: better probing for duration in estimate_timings_from_pts()

It seems it is more secure to simply duplicate the computing routine from compute_pkt_fields to estimate_timings_from_pts.

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

avcodec/h264: Use named identifier for single thread fall-back return from ff_h264_decode_slice_header()

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

s86/scale: Do not return the result of a (void) function from a void function.

Fixes compilation with Sun C 5.12.
Reported by Bradley Mitchell in ticket #3649.

x86/blockdsp: restore author attribution

See commits
649c00c96d7044aed46d70623e47d7434318e6b9
5fecfb7d58a12baf326e99f2d071060f2638d93c
73b02e24604961e49a63ca34203d8f6c56612117

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '852c329a69ddfd635807f60454df07d021c64901'

* commit '852c329a69ddfd635807f60454df07d021c64901':
  configure: Drop duplicate pkg-config entry from help output

Conflicts:
configure

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

configure: Drop duplicate pkg-config entry from help output

Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2'

* commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2':
  i263: skip dummy frames

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

avcodec: add simpleauto idct

This will pick the "best" simple idct compatible idct

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

lavf/Makefile: fix standalone compilation of live_flv demuxer

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: fix NASM output format on Win64

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86/hevc_idct: fix movd parameter size in DC_ADD_INIT

Fixes compilation with NASM x86_64

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

i263: skip dummy frames

Intel i263 codec has special 8-byte dummy frames that should not be decoded,
so do not even attempt to decode them and skip them instead.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>

x86/blockdsp: move asm code out of dsputil

Also replace INLINE_<opt> with EXTERNAL_<opt> that were wrongly
changed by commit 2b05db4f8102148d013755ac2a7e47f6d79ff7ca

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

huffyuv: change statistics initialization

Normally, a Laplace distribution is more typical of the residuals
encoded, but for noisy input, it's both better and simpler to be
safe and use a 1/d^2 distribution. Second hunk could use some
renormalization but it has effectively little impact.

Output size of ffvhuff on various 4:2:0 sequences:
context=0,1/d:    851974   27226   1137281
context=0,1/d²:   619081   25069   1051500
context=0,1/d³:   501983   30454   1290561
context=0,lapl:   500650   31754   1304082

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

avcodec/x86/lossless_videodsp: Fix size of values read for left/left_top

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

Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'

* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9':
  dsputil: Split clear_block*/fill_block* off into a separate context

Conflicts:
configure
libavcodec/asvdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.h
libavcodec/eamad.c
libavcodec/intrax8.c
libavcodec/mjpegdec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c

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

ppc: Fix the bug of fft for little endian environment on POWER7 and later

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

Merge commit '869fc416f7c78ed4e397e0208acd1545771c0502'

* commit '869fc416f7c78ed4e397e0208acd1545771c0502':
  hevc: Mark num_bins_in_se as unused

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

Merge commit 'c385313d2590fd26e26bb9bdacddef78162ab490'

* commit 'c385313d2590fd26e26bb9bdacddef78162ab490':
  rtsp: Support misordered fmtp rtpmap

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