* commit 'e0d73fda':
  avutil: add alias names for gray 8/16 colour spaces
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'd2962e9f':
  pixdesc: Support pixelformat aliases

Conflicts:
	doc/APIchanges
	libavutil/pixdesc.c
	libavutil/version.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '5420099c':
  swscale: correctly pad destination buffer in rgb conversion
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Disfavor video streams with unknown resolution and no packets
Fixes seeking in audio-only-speex.flv
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

The unpacks/shuffles later on makes it unnecessary.

Before:
1508 decicycles in h, 2096759 runs, 393 skips
2512 decicycles in v, 2095422 runs, 1730 skips

After:
1477 decicycles in h, 2096745 runs, 407 skips
2484 decicycles in v, 2095297 runs, 1855 skips
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NJames Almer <jamrial@gmail.com>
Reviewed-by: NChristophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NJames Almer <jamrial@gmail.com>
Reviewed-by: NMickaël Raulet <mraulet@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '23dfa00b':
  fate: explicitly set the default THREADS value

Conflicts:
	tests/Makefile
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'eb9244f2':
  Add Icecast protocol

Conflicts:
	Changelog
	configure
	doc/protocols.texi
	libavformat/icecast.c
	libavformat/version.h

See: e3dc2c86Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NVittorio Giovara <vittorio.giovara@gmail.com>

Bug-Id: 772
CC: libav-stable@libav.org
Found-By: NJustin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: NVittorio Giovara <vittorio.giovara@gmail.com>

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

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

* commit 'bb41115d':
  imgutils: Do not declare avpriv_set_systematic_pal2 in the public header

Conflicts:
	libavutil/internal.h
	libavutil/version.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

This makes the default of '1' more explicit than defaulting to '1' in
fate-run.sh and regression-funcs.sh if THREADS is not set.
Fixes the reported thread count in fate-cpu if THREADS is not set.

Icecast is basically a convenience wrapper around the HTTP protocol.
Signed-off-by: NMartin Storsjö <martin@martin.st>

* commit '1ef9e837':
  avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/mpeg12dec.c
	libavcodec/version.h
	libavfilter/vf_showinfo.c
	libavutil/frame.h
	libavutil/version.h

See: 2a3c36e9Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

* commit 'd0393d79':
  huffyuv: Check and propagate function return values

Conflicts:
	libavcodec/huffyuvdec.c

See: f67a0d11Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '62340581':
  huffyuv: Return proper error codes
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '3160bdc7':
  huffyuv: Use avpriv_report_missing_feature() where appropriate

Conflicts:
	libavcodec/huffyuvdec.c

Not merged, the error messages are not about missing support of features
of the input file. avpriv_report_missing_feature() speaks about
"... your file has a feature which has not been implemented"
Thats would simply not be correct
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'b7616f57':
  huffyuv: Eliminate some pointless casts

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

* commit 'c065f4a0':
  huffyuv: K&R formatting cosmetics

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

* commit 'f89d76c1':
  mpeg4video: Initialize xvididct for all threads

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

* commit 'a238b83b':
  aarch64: use MACH-O const data asm directive in const macro
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'ac6b95db':
  aarch64: add ',' between assembler macro arguments where missing
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'caf5ef85':
  cpu-test: test av_cpu_count
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '07d8fa58':
  fate: add informative cpu test

Conflicts:
	tests/fate/libavutil.mak
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '6a463e7f':
  http: Refactor http_open_cnx

See: c2a170acMerged-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes ticket 3824
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This might in some cases improve performance.

Idea from: fbc0b865Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'fbc0b865':
  lavr: Do not change the sample format for mono audio
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

Bug-Id: CVE-2013-0868

inspired by a patch from Michael Niedermayer <michaelni@gmx.at>
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: NDiego Biurrun <diego@biurrun.de>

CC: libav-stable@libav.org