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

* cehoyos/master:
  Fix hardware detection on aix.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  avconv: Match stream id

Conflicts:
	cmdutils.c
	doc/fftools-common-opts.texi

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

Quite useful to select by pid in MPEG-TS.

~7% faster than AVX
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

docs say:
'A document having more than one "=encoding" line should be considered an error. '
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fixes Ticket3351

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

* qatar/master:
  http: Properly initialize icy headers string
Merged-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>

* commit 'd15c5361':
  doc: Point to the correct, actually maintained gas-preprocessor repo

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

* commit '5a7f382a':
  armv6: vp8: use explicit labels in motion compensation asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa807425':
  configure: Support older version of openjpeg1

Conflicts:
	configure

Not merged as the problematic pkg config code wasnt merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b4e355c8':
  copy_block: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b3c6ee19':
  configure: Group toolchain options together in help output

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

* commit 'e77a2ea9':
  http: Declare more parameters as const where possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The icy_metadata_headers string never gets initialized, so,
during the first call to av_strlcatf() in parse_icy(),
strlen() will be called on a pointer to uninitialized memory.
At best this causes some garbage data to be left at the
start of the string.

By initializing icy_metadata_headers to the empty string, the
first call to strlen() will always return 0, so that data is
appended from the start of the string.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

The integrated arm assembler in clang-503.0.38 (Xcode-5.1) fails
to assemble a branch to 'label + offset' in thumb mode.

It should work best for debian stable and people not installing the .pc
file.

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

For muxing, it accepts
both 0 and AV_NOPTS_VALUE. For demuxing, it will present
AV_NOPTS_VALUE when start_time_realtime is unknown.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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>

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

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