* commit 'cd832f03':
  ffv1: Drop bogus dependency on dsputil

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

* commit '0e29c5e1':
  build: Drop stray LPC dependency on dsputil

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

* commit '6cd76e54':
  build: Drop stray MJPEG encoder dependency on dsputil

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

* commit '9ecf1b62':
  build: Drop stray MLP decoder dependency on dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7d7be44f':
  build: Drop stray PNG decoder dependency on dsputil

Conflicts:
	configure

No change as the stray dependency was not in our configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '88b24064':
  build: Drop stray mpc8 decoder dependency on dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fb9a5bdc':
  Prepare for 11_alpha1 Release

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

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>

ffv1 does not use any part of the dsputil framework.

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>