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

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

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

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

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

This avoids reading uninitialized bytes and confusing valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids reading uninitialized bytes and confusing valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Code si smaller, no speed difference.

This should fix a infinite loop on freebsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3428.

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

Partially fixes Ticket #3404 (xbr filter remaining)

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

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

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

Fixes compilation with --disable-everything --disable-network --enable-demuxer=matroska
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

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

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

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

This fixes loosing the perfectly valid SAR when width=height=0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

gcc 4.2 seems not maintained anymore so theres no option besides
just working around it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* 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.