FFmpeg provides local copies of these headers in compat/avisynth/,
and there is no restriction against using 2.5.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Revert "Allow stream-copying grayscale mov files."
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  http: Allow setting a Content-Type for POST requests

Conflicts:
	libavformat/http.c

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

* commit 'fe568b3d':
  http: Improve options descriptions

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

See: 255ec768
See: 0a7cd740Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ab76d9f6':
  http: Always allow no-op seek

Conflicts:
	libavformat/http.c

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

* commit '2ec33d27':
  http: Add support for selecting a request range

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

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

* commit 'ddfc9890':
  http: Support setting custom User-Agent

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

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

* commit 'e58c85b0':
  http: Export Content-Type information

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

See: 76d851b6
See: 20899c54
See: 255ec768Merged-by: Michael Niedermayer <michaelni@gmx.at>

* 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>

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

Add documentation where missing.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

This also allows checking stream position as per ffurl_seek() doxy.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Comment from Reimar Döffinger included as pro memoria.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Contextually make the default User-Agent use the common
"Name/Version" pattern.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

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>

This reverts commit 691dec62.

The commit did not fix ticket #3215, it was fixed one commit earlier.
The revert may break other use-cases but they should be fixed differently,
the offending commit introduced too many problems.

Fixes ticket #3377.
Fixes ticket #3378.

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

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