* commit '8c929098':
  hls: Check whether the AVIOContext contains a new redirected URL
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'be4edda6':
  http: Expose the content location via an AVOption

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

* commit '393d80cc':
  http: Support relative URL redirection

Conflicts:
	libavformat/http.c

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

This is already available in Texinfo version.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

* commit '76267ecc':
  http: Remove an unrelated and mistakenly set AVOption unit name
Merged-by: Michael Niedermayer <michaelni@gmx.at>

All other test programs are under #ifdef TEST too
with the implementation and test code being generally in the same file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes hypothetical integer overflow with HNM4_CHUNK_ID_IZ
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Avoids len from becoming negative and causing assertion failure

Fixes: signal_sigabrt_7ffff7126425_5140_fd44dc63fa7bdd12ee34fc602231ef02.jpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes integer overflow and assertion failure
Fixes: signal_sigabrt_7ffff7126425_1243_CASSE.HNM

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Its possible in various rare cases that an index cannot be created or allocated.
Fixes assertion failure
Fixes: signal_sigabrt_7ffff7126425_7712_pokem.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Nitted-By: ubitux

This should fix trac tickets #1163, #2502.

This allows to make use of validation features.

In particular, document AV_DICT_MATCH_CASE, AV_DICT_IGNORE_SUFFIX, and
extend documentation for av_dict_get().

This allows both the main playlist itself as well as the variant
playlists to handle redirects combined with relative URLs.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

In RFC 2616, this was explicitly said to be an absolute URL,
while in an upcoming draft [1] it is allowed to be relative as well.

[1] http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-25#section-7.1.2Signed-off-by: Martin Storsjö <martin@martin.st>

This was due to a copypaste oversight.
Signed-off-by: Martin Storsjö <martin@martin.st>

* qatar/master:
  aacps: Adjust some const qualifiers to suppress warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '430d1219':
  pcx: round up in bits->bytes conversion in a buffer size check

Conflicts:
	libavcodec/pcx.c

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

* commit 'c918e08b':
  truemotion1: make sure index does not go out of bounds

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

* commit 'ce9bba53':
  avidec: fix a memleak in the dv init code.

Conflicts:
	libavformat/avidec.c

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

* commit 'de4ec972':
  vc1: fix a memleak.

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

* commit 'ca41c72c':
  motionpixels: clip VLC codes.

Not merged, the change is wrong, the condition is not possible unless
there are serious bugs elsewhere. No such bugs should exist in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8b516f15':
  matroskadec: use correct compression parameters for current track CodecPrivate

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

* commit '30be1ea3':
  matroskadec: pad EBML_BIN data.

Conflicts:
	libavformat/matroskadec.c

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

* commit 'f0259a58':
  h264: check buffer size before accessing it

Conflicts:
	libavcodec/h264.c

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

* commit '1f3e56b6':
  gifdec: convert to bytestream2

Conflicts:
	libavcodec/gifdec.c
	libavcodec/lzw.c
	libavcodec/lzw.h

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

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

* commit 'c453723a':
  gifdec: check that the image dimensions are non-zero

Conflicts:
	libavcodec/gifdec.c

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

* commit '074c769d':
  h264_cavlc: check the size of the intra PCM data.

This check is redundant, but does no harm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

(cherry picked from commit 0c8dfd8ad6400b33da55a9f4d9aa8d3f5c9d209f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>