Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

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

* cehoyos/master:
  Improve amr bitrate calculation for VBR files.
  Warn if rawvideo and an unreadable pix_fmt are written.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes ticket #3541.

Print an error if a combination of rawvideo and an unusual pix_fmt
that will be impossible to decode are written to avi or mov.
Fixes ticket #3545.

* commit '254c95cd':
  resample: split linear into its own function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'be394968':
  resample: add initial padding explicitly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'eed752d6':
  resample: drop useless abs()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3c84f6b5':
  resample: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f20892eb':
  resample: split the nearest neighbour path into a separate function pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b9dea237':
  resample: fix avresample_get_delay() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This simplifies the code, since we do not have to deal with a possibly
negative source index anymore.

negative sample_index is handled in the block above.

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

Adds messages that allows to control (audio) buffer and play/pause state.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

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>

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

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

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

* commit '67685620':
  DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride

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

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

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

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

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

* qatar/master:
  mp2: Do not force a samplerate

Conflicts:
	libavcodec/mpegaudioenc_template.c

Only libtwolame changes, as the forcing of a sample rate was not merged for the native mp2 encoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>

If 384k is too high for the samplerate, choose the closest
possible

Idea to increase the bitrate from: 46439e15Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The default should be not to resample.

ffurl_seek() will not work even when it should be a no-op, so do not
call it on crypto protocol.

Also replace use of ffurl_size() for the same reason.
Reported-by: Michael Schenk <Michael.Schenk@albistechnologies.com>
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>

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

The missing swscale feature was implemented in 2011.

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

Fixes make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  libx265: Only set the SAR if it is valid
  libx265: Use 16-bit SAR
  libx265: Use x265_param_parse to set the SAR

See: 8945dcbb
See: fcc43e02
See: cdd21f1fMerged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '9a07fac6':
  mov: read hydrogenaudio replaygain information

Conflicts:
	libavformat/Makefile
	libavformat/mov.c

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

This causes us to favor RGB8 over PAL8 when FF_LOSS_COLORQUANT is used

It probably makes sense to reinvestigate the exact scoring of pal8 when
our pal8 support improves to be supperior to rgb8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>