* commit '1f0c6075':
  4xm: drop pointless assert

Conflicts:
	libavcodec/4xm.c

The added condition is impossible to occur and thus is added to the assert.
The assert is not removed from the default case, as the default case cannot
occur. Thus either it should stay as is or the case as a whole be removed.
For extra safety, to ensure this doesnt change the assert is changed to
av_assert0()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b8b80990':
  4xm: forward errors from decode_p_block

Conflicts:
	libavcodec/4xm.c

Impossible to be false check has been replaced by av_assert0()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '50ec1db6':
  4xm: fold last_picture lazy allocation in decode_p_frame

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

* commit '42d73f7f':
  4xm: do not overread while parsing header

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

* commit 'e7a44f87':
  4xm: refactor fourxm_read_header

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

* commit 'e6496ea7':
  4xm: K&R formatting cosmetics

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

* commit '08859d19':
  4xm: use the correct logging context
  g2meet: Fix a typo in the height comparison
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

frei0r license is GPL.

Based on a patch by Timothy Gu <timothygu99@gmail.com>.

See thread:
Subject: [FFmpeg-devel] [PATCH 1/2] LICENSE: Complete GPL'd external libraries list
Date: Thu,  6 Jun 2013 18:55:30 -0700

Based on the libavfilter SOC filter by Vitor Sessak, with the following additions:
* integer arithmetic
* bilinear interpolation
* RGB path
* configurable parametric angle, output width and height

Address trac issue #1500.

See thread:
Subject: [FFmpeg-devel] [WIP] rotate filter(s)
Date: 2010-10-03 17:35:49 GMT

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

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

Make sure the value of wlog2 is always between 0 and 3.

Partially mitigate out of memory writes.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Split sound and video tag parsing in separate functions.

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

* qatar/master:
  g2meet: do not leak buffers
  g2meet: more graceful cursor loading
  g2meet: reset dimensions on header parsing errors

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

Also replace custom tests for MD5 with those published in RFC 2202
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Includes HMAC-SHA-224, HMAC-SHA-256, HMAC-SHA-384, and HMAC-SHA-512.
Tested using test vectors from https://tools.ietf.org/html/rfc4231Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes #2657.
ISML movies produced by Microsoft Expression Encoder 4 seem to have invalid
sample entries in their trun/tfhd for data tracks. As a result, too much bytes
are read for these tracks to the point that next_root_atom can go out of
buffer, which makes the encoding fail if the input is not seekable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  lavc: add a libwavpack encoder wrapper

Conflicts:
	Changelog
	doc/encoders.texi
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '799f57ac':
  lavc: use AVFrame API properly in pad_last_frame().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8835c554':
  matroskadec: introduce resync function.

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

* commit '3965d404':
  configure: Don't add -fPIC on windows targets
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3fd0d166':
  configure: Don't explicitly disable PIC for windows targets
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2aa33254':
  configure: arm: Don't try to enable pic for shared libraries on win32
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2645
Found-by: Darrell Walisser
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This makes the conversion function more robust.