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

This function was introduced by ac4b32dfSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  dsputil: Move DV-specific ff_zigzag248_direct table to dvdata

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

* commit '57b5b84e':
  x86: dsputil: Move ff_apply_window_int16_* bits to ac3dsp, where they belong
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c2c5be57':
  x86: h264_qpel: Simplify an #if conditional
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '01c5779f':
  x86: Drop some unnecessary YASM ifdefs

Conflicts:
	libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b718b24b':
  ppc: Drop a bunch of unnecessary dsputil_altivec.h #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b42f49e4':
  x86: dsputil: Eliminate some unnecessary dsputil_x86.h #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3dc6272b':
  Remove a number of unnecessary dsputil.h #includes

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

~10% faster than the SSE version.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some compilers when given -x objective-c will tell that they dont support
that but return success. Using a .m file instead returns proper failure in
that case

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

This should make no difference currently
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes compilation failures with "--disable-{avx,fma3} --disable-optimizations"
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

lavf/avidec: Read metadata EXIF tags from AVIF tag. Based on patch by Gregory Wolfe (Kodak Alaris) <gregory.wolfe@kodakalaris.com>.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* cehoyos/master:
  Allow .y as extension for image2.
  Show stream number when warning about stream without start time.
  Force gif aspect ratio multiplication to 64bit.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Avoids a possible integer overflow.

* qatar/master:
  af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a49aa440':
  af_volume: implement replaygain pre-amplification

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

alternatively the call could be put under #if or the #if
over the function removed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c74b8669':
  x86/synth_filter: add synth_filter_fma3
  x86/synth_filter: add synth_filter_avx
  x86/synth_filter: add synth_filter_sse

Conflicts:
	libavcodec/x86/dcadsp.asm
	libavcodec/x86/dcadsp_init.c

See: 64672098
See: 68c3ed93
See: 7fd64e3e
See: aa1f3801
See: dfd865e5Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b97f2c7c':
  replaygain: remove unused variable

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

* commit '0048deb8':
  oggparsevorbis: export replaygain tags from Vorbis comments

Conflicts:
	libavformat/Makefile
	libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1d55f8d5':
  flacdec: export replaygain tags from Vorbis comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8542f9c4':
  replaygain: correctly parse peak values

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

* commit '25b6837f':
  replaygain: fix gain sign decoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This change make error handling simplier.
av_opt_freep_ranges may be called when some ranges are NULL,
for example after memory allocation fail.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This reverts part of 41e7e46c

See: http://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The extra conditions are covered by previous #ifs and conditional compilation.

Dead code elimination is enough to avoid undefined references in these cases.