DNxHD: K&R formatting cosmetics
DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride
DNxHD: convert inline asm to yasm
Merge commit '89ef08c992c484a46711b1a68a988303679c288e'

* commit '89ef08c992c484a46711b1a68a988303679c288e':
  DNxHD: K&R formatting cosmetics

Conflicts:
	libavcodec/dnxhd_parser.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '676856204b84dfaffe329dce8502e834a0dbdb19'

* commit '676856204b84dfaffe329dce8502e834a0dbdb19':
  DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride

Conflicts:
	libavcodec/dnxhdenc.h
	libavcodec/x86/dnxhdenc_init.c

See: cb11b9e89e152ed4db22e5ad0349b63fac02101e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  DNxHD: convert inline asm to yasm

Conflicts:
	libavcodec/x86/Makefile
	libavcodec/x86/dnxhdenc.asm

See: 9d34dce05ba704180916433e13add3f01b54313b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavd: add device capabilities API

Provides API to query device capabilities.
Each device must implement callbacks to benefit from this API.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
lavd: add control message enums

Adds messages that allows to control (audio) buffer and play/pause state.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
resample: fix avresample_get_delay() return value

The correct "next" input sample is not the first sample of the
resampling buffer, but the center sample of the filter_length-sized
block at the beginning.

CC:libav-stable@libav.org
resample: split the nearest neighbour path into a separate function pointer
resample: reindent
resample: drop useless abs()

negative sample_index is handled in the block above.
resample: add initial padding explicitly

This simplifies the code, since we do not have to deal with a possibly
negative source index anymore.
resample: split linear into its own function
Add AVFoundation input device.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'

* commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f':
  resample: fix avresample_get_delay() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'

* commit 'f20892eb67a7b4b5a3c080388a35a3380516a805':
  resample: split the nearest neighbour path into a separate function pointer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'

* commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5':
  resample: reindent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3'

* commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3':
  resample: drop useless abs()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'

* commit 'be394968c81019887ef996a78a526bdd85d1e216':
  resample: add initial padding explicitly

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