* commit 'd351ef47':
  pthread_frame: use the AVFrame API properly.

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

Muxing VP6 is used by applications and works with Flashplayer.

Reported-by: David Bertrand

* commit 'b605b123':
  mxpegdec: use the AVFrame API properly.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'afa21a12':
  p*menc: use the AVFrame API properly.

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

* commit 'e2274aa5':
  mjpegdec: use the AVFrame API properly.

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

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b2)

Conflicts:

	libavcodec/jpeglsdec.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f0b234ab':
  avformat: AviSynth demuxer rewrite

Conflicts:
	configure
	libavformat/avisynth.c

See: b9ad0094 (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Remove the extended_data workaround, all decoders should now handle this
properly.

* qatar/master:
  configure: Move adding of compat objects out of libc detection
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4958f35a':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
	libavcodec/arm/ac3dsp_init_arm.c
	libavcodec/arm/ac3dsp_neon.S
	libavcodec/x86/ac3dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Using subst here is a really ugly hack
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It was misplaced during merge of commit 120797e2Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Directly loads AviSynth through LoadLibrary instead of relying on
Video for Windows, and supports using AvxSynth (via dlopen) to
open scripts on Linux and OS X.

Error messages from AviSynth/AvxSynth are now reported through
av_log and exit, rather than the traditional behavior of generating
an error video that the user would need to watch to diagnose.

The main rewrite was authored by d s <avxsynth.testing@gmail.com>
from the AvxSynth team, with additional contributions by

Oka Motofumi <chikuzen.mo@gmail.com>
Stephen Hutchinson <qyot27@gmail.com>
Diego Biurrun <diego@biurrun.de>
Anton Khirnov <anton@khirnov.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

* qatar/master:
  configure: Separate MinGW32 and MinGW64 libc handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

The (optimized) functions are used nowhere else.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0

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

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

Signed-off-by: Diego Biurrun <diego@biurrun.de>

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

* rbultje/vp9-simd:
  vp9: implement top/left half (4x4) sub-8x8-IDCT.
  vp9: split pre-load of 11585x2 out of 1d idct macro.
  vp9: minor refactorings in idct ssse3 assembly.
  vp9: split x86 assembly in two files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

For that specific case (eob>3&&eob<=12), runtime of idct8x8 goes from
668 to 477 cycles. For all idct8x8, runtime goes from 521 to 490 cycles.

This allows us to load it only once, instead of twice, in this function.

Make register usage in macros explicit; change mulsub_2w_4x to use 2
instead of 3 temp registers.

(And in future, loopfilter or intra pred could be put in their own
respective files also.)

* cus/stable:
  ffplay: set default window size before starting audio
  ffplay: factor out function setting default window size
  ffplay: remove no longer necessary codec flush
  ffplay: do not wait for flushing the picture queue on flush packet
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>