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

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>

* commit 'c697c590':
  lcl: Disentangle pointers to input data and decompression buffer

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

* commit 'df507d5a':
  tiff: Replace deprecated PIX_FMT names by modern ones

Conflicts:
	libavcodec/tiff.c

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

* commit '7835c24e':
  dv: Update DV-profile-related functions to current public API

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

there is flushing code in the avformat core that does this in a more
controlled way.

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

This makes problematic unconditional flushes in mpegts redundant
And is thus part of a fix for ticket 2748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Also add missing mem.h header for av_freep().

Found-by: CSA
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Makes the code a bit easier to read
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The name of the paragraph sounded a bit silly, and its text is small so
it's better to merge it with the previous paragraph.