* commit '4b6b1082':
  lavc: Deprecate avctx.me_method

Conflicts:
	doc/encoders.texi
	libavcodec/avcodec.h
	libavcodec/libx264.c
	libavcodec/motion_est.c
	libavcodec/options_table.h
	libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '03eb5574':
  wmv2enc: Check memory allocation

Conflicts:
	libavcodec/wmv2enc.c

See: 6e8fe448Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'a67b6794':
  ac3enc_template: Use the correct context field

See: 320ce9f2Merged-by: Michael Niedermayer <michael@niedermayer.cc>

it is not optimal when the buffer size is well known at allocation time

This avoids a memcpy()

about 1% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

This parameter can be used to inform the allocation code about how much
downsizing might occur, and can be used to optimize how to allocate the
packet
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Avoid clipping due to quantization noise to produce audible
artifacts, by detecting near-clipping signals and both attenuating
them a little and encoding escape-encoded bands (usually the
loudest) rounding towards zero instead of nearest, which tends to
decrease overall energy and thus clipping.

Currently fate tests measure numerical error so this change makes
tests using asynth (which are near clipping) report higher error
not less, because of window attenuation. Yet, they sound better,
not worse (albeit subtle, other samples aren't subtle at all).
Only measuring psychoacoustically weighted error would make for
a representative test, so that will be left for a future patch.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Failure should not be possible, if it does occur then the code is
buggy and should be fixed not silently clip
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This option is extremely codec specific and only a few codecs employ it.
Move it to codec private options instead: mpegenc family supports only 3
values, xavs and x264 use 5, and xvid has a different metric entirely.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

For audio encoders, delay has no effect, use the appropriate one,
initial_padding (see 2df0c32e).

Fixes Ticket4200
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '60a21b3d':
  configure: Check for _M_ARMT to detect thumb when using MSVC

Conflicts:
	configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '616b409c':
  configure: Check MSVC defines for identifying hardfloat
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '2192ff84':
  configure: Default to armasm for --toolchain=msvc when targeting arm
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'e4015b00':
  configure: Simplify, remove an unnecessary intermediate variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '6d3081e6':
  doc: Remove the now unnecessary remark about PATH and link.exe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '9e8627a1':
  asfdec: interpret the first flag in an asf packet as length flag
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '65c14801':
  checkasm: Modify report format
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'f3bd3810':
  qsvdec_*: add missing CODEC_CAP_DR1
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

This macro identifies whether VFPv3 is available; MSVC defaults
to hardfloat (except for older MSVC versions for CE, targeting
ARMv4).
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

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

if the error correction flag is not set, a packet starts with payload
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Makes it a bit more clear where each test belongs.

Suggested by Anton Khirnov.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reviewed-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '342b0ba5':
  configure: Only redirect strtoll to _strtoi64 if necessary

Conflicts:
	configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '5fd553d3':
  configure: Only redefine inline to __inline for msvc if necessary

Conflicts:
	configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '0cff1252':
  configure: Only add -FIstdlib.h for msvc/icl if necessary

Conflicts:
	configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '9b4b96c0':
  force WINAPI_FAMILY to WINAPI_FAMILY_DESKTOP_APP to be able to use dxva.h

Conflicts:
	libavcodec/dxva2_internal.h

See: c5327df8Merged-by: Michael Niedermayer <michael@niedermayer.cc>