* commit '54974c62':
  error_resilience: decouple ER from MpegEncContext

Conflicts:
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd9ebb00d':
  svq3: remove a pointless if()
  h264: remove a pointless if()

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

* commit '68f930d2':
  h264: simplify calls to ff_er_add_slice().

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

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

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

* commit 'd2a25c40':
  get_buffer(): do not initialize the data.

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

This prevents a regression from the removial of the buffer
initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Improves Motion estimation, avoids using out of picture areas for %16 != 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '64ed3976':
  vf_yadif: fix out-of line reads

Conflicts:
	libavfilter/vf_yadif.c
	tests/ref/fate/filter-yadif-mode0
	tests/ref/fate/filter-yadif-mode1
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ccd70d9c':
  vf_yadif: factorize initializing the filtering callbacks

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

* cus/stable:
  ffplay: only display frames if there are no pending events
  ffplay: remove remains of video_clock
  ffplay: remove refresh thread to achieve more precise frame delay
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Finish what 99162f8d started
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

No need to recompute it for each new frame.

This improves the performances just enough to match mp=kerndeint.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Also update the documentation accordingly, and suggest a meaningful range.

Also drop pointless example.

In particular, avoid out-of-buffer access and crashes with too big
values, and rework documentation accordingly.

This tries to compensate for the errors introduced by
the rounding of pmulhw
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes FATE in MSVC DLL builds.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Correct the advancement of a pointer to skip over LFE samples as
intended in the loudness computation.

This suggested patch is 3 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one batch.

Correct the recognition of channel layouts for good channel weight
in the loudness computation.
This suggested patch is 2 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".

Signed-off-by: David A. Sedacca <sedacca at comcast.net>

The H264 context is always uninitialized at this point.

!encoding is always true, we do not have a H.264 encoder

partitioned_frame is never set for h264 (as easily seen from git grep).

There may be more decoders that rely on this. Those should be found and
fixed.

Some changes in the border pixels, visually indistinguishable.

Do it all in config_props().

Otherwise events could just pile up if displaying a frame takes more time than
the duration of the frame.
Signed-off-by: Marton Balint <cus@passwd.hu>

* qatar/master:
  sparc: dsputil: Simplify high_bit_depth checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '49fe2807':
  h264idct: Replace duplicate scan8 table by appropriate #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4db96649':
  avutil: Ensure that emms_c is always defined, even on non-x86
  configure: Move MinGW CPPFLAGS setting to libc section, where it belongs
  avutil: Move emms code to x86-specific header

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

The problem is reproducible with a relative prefix path.

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