* commit 'bc1eace1':
  jack: Check memory allocation

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

* commit 'f7e93247':
  audiointerleave: Always initialize new_pkt

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

* commit '8ef98855':
  sctp: Always initialize outmsg struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'caf7be30':
  mpjpgdec: free AVIOContext leak on early probe fail

Conflicts:
	libavformat/mpjpegdec.c

See: 34d278f9, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '925b80d6':
  mpegvideo: Move OutFormat enum to mpegutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9bb11be0':
  mpegvideo: Split picture allocation for encoding and decoding

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

Otherwise the check 'tile_size < size' treats a negative size as
unsigned, causing the check to pass. This subsequently leads to
segmentation faults.

This was originally fixed as part of Libav commit 72ca83, so the
original author is one of the following developers:
        Anton Khirnov <anton@khirnov.net>
        Diego Biurrun <diego@biurrun.de>
        Luca Barbato <lu_zero@gentoo.org>
        Martin Storsjö <martin@martin.st>
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

* commit 'f8716a14':
  mpegvideo: Rework frame_size_alloc function

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

* commit 'da0c8664':
  mpegvideo: Move various temporary buffers to a separate context

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/rv34.c
	libavcodec/vc1_mc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>

* commit 'a6f19d6a':
  configure: Support MSVC 2015

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

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

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

Currently restricted to blending pixels that only contain either
0 or 255 in their alpha components
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The spec specifies the dispose operation as how the current (i.e., currently
being rendered) frame should be disposed when the next frame is blended onto it

This is contrary to ffmpeg's current behaviour of interpreting the dispose
operation as how the previous (i.e., already rendered) frame should be disposed

This patch fixes ffmpeg's behaviour to match those of the spec, which involved
a rewrite of the blending function
Signed-off-by: Donny Yang <work@kota.moe>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This can be useful for debugging, or in scenarios where the user
doesn't want to use the system's DNS settings for whatever reason.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

CC: libav-stable@libav.org
Bug-Id: CID 1292520

CC: libav-stable@libav.org
Bug-Id: CID 609333

CC: libav-stable@libav.org
Bug-Id: CID 1302711

It is necessary to avoid circular header dependencies.

The main ff_alloc_picture() function is made more generic with all the
parameters necessary as arguments. This will allows to move most of the
related functions to a separate file later.

Right now wrappers are provided to try and minimize the number of
changes in the code.

Use more generic arguments and remove its static attribute since it will
be moved to a separate file.

The C runtime C99 compatibility had been improved a lot and it now
rejects some of the compatibility defines provided for the older
versions.

Many thanks to Ray for the time spent testing.

Bug-Id: 864
CC: libav-stable@libav.org

previous patch reviewed-by: tim nicholson <nichot20@yahoo.com>
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>

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

Fixes Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Needed to fix Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'bc76c469':
  aac: Wait to know the channels before allocating frame

Conflicts:
	libavcodec/aacdec.c

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

* commit 'a188108e':
  aac: Support channel configurations 11 and 12
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '677c804a':
  aac: correctly map 7.1ch-wide AAC from FDK AAC encoder

Sample: FDK_7.1ch_wide.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '252d6200':
  avio: Add avio_put_str16be

Conflicts:
	doc/APIchanges
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/version.h

The FFmpeg implementation is kept as requested by ubitux
Doxy improvements merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9b56ac74':
  mpjpeg: Initial implementation

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>