Signed-off-by: Michael 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: Michael Niedermayer <michaelni@gmx.at>

* 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: Michael Niedermayer <michaelni@gmx.at>

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

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

Conflicts:
	libavcodec/huffyuvdec.c

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

* commit '62340581':
  huffyuv: Return proper error codes
Merged-by: Michael 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: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

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

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

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

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

* commit '6a463e7f':
  http: Refactor http_open_cnx

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

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

This might in some cases improve performance.

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

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

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

Signed-off-by: Diego 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: Diego Biurrun <diego@biurrun.de>

CC: libav-stable@libav.org

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

llvm's integrated assembler does not accept spaces as macro argument
delimiter when targeting darwin. Using a explicit delimiter is a good
idea in principle since it makes case like 'macro 4 -2' vs 'macro 4 - 2'
clear.

Add CPU count and number threads as informative values for fate.

libavutil/cpu-test prints raw and effective cpu flags to STDERR. Detected
cpu flags can be useful for debugging fate errors.

No comparison of the result against a expected result since that would
require fate config specific references.

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

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

Split return value handling from the actual opening.

Incidentally fixes the https -> http redirect issue reported by
Compn on behalf of rcombs.

CC: libav-stable@libav.org

This treats mono as planar internally within libavresample rather
than changing the sample format.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* commit '9f17685d':
  avcodec: Deprecate unused defines and options

Conflicts:
	doc/APIchanges
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bad81800':
  avcodec: options: Add missing deprecation ifdefs around emu_edge
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '072916d9':
  filtfmts: Replace deprecated uses of AVFilterPad

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

* commit '6a928293':
  examples: filter_audio: Add missing mem.h header for av_freep()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c6a1ac2d':
  vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame

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