* commit '8075c3d8':
  http: Add support reading ICY metadata

Conflicts:
	doc/protocols.texi
	libavformat/http.c

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

* commit '4ff99ab3':
  http: Refactor process_line

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

* commit '7a2fddb4':
  http: K&R formatting cosmetics

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

* commit '78b21c1d':
  http: Drop doxy comments

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

* commit '55a215ba':
  http: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '390acbea':
  configure: Provide --pkg-config-flags

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'db9d39b4':
  avformat: Report the duration analysis reached

Conflicts:
	libavformat/utils.c

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

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

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Export the metadata as a icy_metadata_packet avoption.
Based on the work of wm4 and Alessandro Ghedini.

Bug-Id: https://bugs.debian.org/739936Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Should be used only to pass extra flags to pkgconf invocation,
e.g. --static.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* qatar/master:
  doc: Add section about AviSynth support

Conflicts:
	doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5926603a':
  configure: Document --pkg-config option

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd92024f1':
  lavf: more correct printf format specifiers

Conflicts:
	libavformat/asfdec.c
	libavformat/cafdec.c
	libavformat/dxa.c
	libavformat/framecrcenc.c
	libavformat/hnm.c
	libavformat/iff.c
	libavformat/mov.c
	libavformat/mxfdec.c
	libavformat/rmdec.c
	libavformat/rpl.c
	libavformat/smacker.c
	libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Diego Biurrun <diego@biurrun.de>

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

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

* cehoyos/master:
  Decode png images without iend chunk.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Fixes ticket #3357.

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

The unconditional dependancy was added in 7671dd7cSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* cehoyos/master:
  Define ff_log2_run[] in libavcodec/internal.h.
  Replace an incorrect av_free() in movenc.c with av_freep().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  configure: miscellaneous cosmetics

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '77e9123f':
  lavf: always use av_free

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

Sort lists of components. Add some whitespace where it helps readability.
Consistently use double instead of single quotes around component lists.

* commit '34bbc81d':
  lavf: simplify ff_hevc_annexb2mp4_buf

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

* commit '4a856239':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
	configure

No change as the incorrect code wasnt in ffmpegs configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ee17be3f':
  hevc: Use get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5eacbb53':
  golomb: Add a get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>