* commit 'd349afb0':
  dv: cosmetics, reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '650dee63':
  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>

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

Conflicts:
	libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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>

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>

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

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

Also suggest what can be done to workaround the limitation.

Based on avcodec.h documentation.

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>

* commit '440842c4':
  stereo3d: add missing include guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The blockdsp split did not cover Alpha optimizations
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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>

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

See commits
649c00c9
5fecfb7d
73b02e24Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit 'b2290bf1':
  i263: skip dummy frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This will pick the "best" simple idct compatible idct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Fixes compilation with NASM x86_64
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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>

Also replace INLINE_<opt> with EXTERNAL_<opt> that were wrongly
changed by commit 2b05db4fSigned-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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>

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

* commit 'e74433a8':
  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>

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

* commit '869fc416':
  hevc: Mark num_bins_in_se as unused
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c385313d':
  rtsp: Support misordered fmtp rtpmap
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c9c1e00f':
  rtsp: Factor out fmtp parsing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '49a24268':
  doc: Document segment_list_type

Conflicts:
	doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>