The log is good enough for tracking those changes.

* commit '2fa6d211':
  on2avc: Fix out of array access

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

* commit '74d7db58':
  dv: Drop a spurious check

Conflicts:
	libavcodec/dvdec.c

See: 5307fa00Merged-by: Michael Niedermayer <michaelni@gmx.at>

Hyllian's message : "Hi, Put lgpl on this and use it as you wish. It's free!"
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>

In http_open_cnx, the patch restores the AVDictionary if connection needs to be re-tried
because of a authentication/redirect status code.

Previously, if a 401/407/30x status code was encountered, http_open_cnx would restart at the redo label, but any options
used by the underlying protocol would be missing because they were removed by the first attempt.
Signed-off-by: Brandon Lees <brandon@n-hega.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Suggested-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The buffer is always valid.

Bug-Id: CID 700682

this would cause mfra to be ignored in files larger than 2G
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8562c148':
  Icecast: Send content-type in all cases

See: 5e08b54fMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3a6bb973':
  Icecast: Send 100-continue header if possible

See: 17dc39e7Merged-by: Michael Niedermayer <michaelni@gmx.at>

This is needed because Icecast since version 2.4.1 doesn't default
to audio/mpeg anymore. AVOption default not used here, since a later
check if -content_type is set is performed and would break.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

This allows for proper error reporting. Only do
this for non-legacy requests as only Icecast >2.4.0
will reply with a proper status.
Libav seems to accept both, 100 and 200 status codes, but
let's stay close to spec.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

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

Based-on: 2e170405 by Kieran Kunhya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/tinterlace: Move lowpass_line to a separate function and call it through a function pointer

This permits replacing it by a optimized implementation
Based-on / Idea-from: 2e170405 by Kieran Kunhya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/tinterlace: split context definition into seperate header so it can be used by future optimizations

Idea from 2e170405 from Kieran Kunhya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '2e170405':
  vf_interlace: Add SIMD for lowpass filter

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

* commit 'd16ec1b6':
  atrac3plus: always initialize refwaves

The initialization is not needed, the array is never read before
being written to. Its merged anyway for robustness in respect to
future changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '60e0ee7c':
  lpc: always initialize ref and err

The initialization is not needed, its merged anyway as it might
help suppressing warnings and might make the code more robust against
future changes

See: c4a36b6f
See: 0dd99628Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3a6ddfb8':
  exr: check return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e4cb6abb':
  bgmc: fix sizeof arguments

See: 41bf943fMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4b39cc1a':
  riff: support ProRes in avi (APCN fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

CC: libav-stable@libav.org
Bug-Id: CID 29585 / CID 700759

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

CC: libav-devel@libav.org
Bug-Id: CID 608084 / CID 700724