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

* commit 'c00365b4':
  aarch64: Make the function pointer tables position independent
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This allows running the code on android, where 64 bit binaries with
text relocations aren't allowed to be loaded.
Signed-off-by: Martin Storsjö <martin@martin.st>

No speed difference.

Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ffmpeg -h filter=xbr

See 57688aec

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>