Merge commit '801c39e1e3058fc4ba822bfb5d8612d777111e32'

* commit '801c39e1e3058fc4ba822bfb5d8612d777111e32':
  dcadec: Use correct channel count in stereo downmix check

Conflicts:
libavcodec/dcadec.c

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

Merge commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560'

* commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560':
  dcadec: Do not decode the XCh extension when downmixing to stereo

Conflicts:
libavcodec/dcadec.c

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

Merge commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731'

* commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731':
  tiffdec: support predictor type 2 with RGB48 pixel format

Conflicts:
libavcodec/tiff.c

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

Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'

* commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe':
  tiffdec: remove an unneeded variable

Conflicts:
libavcodec/tiff.c

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

Merge commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed'

* commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed':
  tiff: use a better name and enum values for PhotometricInterpretation

Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c

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

Merge commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc'

* commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc':
  tiffdec: use a single strip if RowsPerStrip is 0

Conflicts:
libavcodec/tiff.c

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

Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'

* commit '0a467a9b594dd67aa96bad687d05f8845b009f18':
  tiffdec: use bytestream2 to simplify overread/overwrite protection

Conflicts:
libavcodec/tiff.c

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

Merge commit '5748faf291fec297ef25d81962b52b3438f54278'

* commit '5748faf291fec297ef25d81962b52b3438f54278':
  bytestream: add bytestream2_copy_buffer() functions

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

Merge commit 'de9d2705f61ef569487ec5f8974a9c7ce34ec783'

* commit 'de9d2705f61ef569487ec5f8974a9c7ce34ec783':
  bytestream: add functions for accessing size of buffer

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

Merge commit '58bc38a5f224d29b79338200459792c765c25fd5'

* commit '58bc38a5f224d29b79338200459792c765c25fd5':
  tiffdec: use correct data type for palette entries and set alpha to 0xFF

Conflicts:
libavcodec/tiff.c

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

Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'

* commit 'bf2064f046af64c59a416c814474a39b0a457569':
  tiffdec: rename variables for consistency and fix variable shadowing

Conflicts:
libavcodec/tiff.c

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

Merge commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801'

* commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801':
  swscale: Set alpha to opaque for internal palettes.

Conflicts:
libswscale/swscale_unscaled.c

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

Merge commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915'

* commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915':
  swscale: fix some undefined signed left shifts

Conflicts:
libswscale/swscale_unscaled.c

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

Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'

* commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad':
  swscale: fix an implementation-defined unsigned-to-signed conversion

Conflicts:
libswscale/swscale_unscaled.c

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

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/qtkit: add device category
  lavd/fbdev_enc: implement get_device_list
  lavd: no default device unless explicitly set

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

Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'

* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
  doc: Libavfilter English cleanup

Conflicts:
doc/filters.texi
doc/libavfilter.texi

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

dcadec: Use correct channel count in stereo downmix check

s->prim_channels is greater than num_core_channels
when an XCh extension is present in the bitstream.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

dcadec: Do not decode the XCh extension when downmixing to stereo

This is neither necessary nor currently supported.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'

* commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
libavformat/mp3enc.c

See: 40176fc3149bc72c1309f93989a57aec2322e626
See: d62bf5d4e73250295c0a652e151498c5b19cbd63
See: various others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

tiffdec: support predictor type 2 with RGB48 pixel format

tiffdec: remove an unneeded variable

tiff: use a better name and enum values for PhotometricInterpretation

Also add additional known values and log as missing features.

tiffdec: use a single strip if RowsPerStrip is 0

The spec does not specify that 0 is an error condition, and there
are samples which use 0 when the whole image is in one strip.

tiffdec: use bytestream2 to simplify overread/overwrite protection

Based on a patch by Paul B Mahol <onemda@gmail.com>

CC:libav-stable@libav.org

bytestream: add bytestream2_copy_buffer() functions

This is basically an overread/overwrite-safe memcpy between a
GetByteContext and a PutByteContext.

CC:libav-stable@libav.org

bytestream: add functions for accessing size of buffer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

tiffdec: use correct data type for palette entries and set alpha to 0xFF

tiffdec: rename variables for consistency and fix variable shadowing

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

avutil/log: add av_log_get_flags()

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

swscale: Set alpha to opaque for internal palettes.

Fixes conversion of pal8 to rgb formats with alpha.

Updated references for 2 FATE tests which previously encoded fully
transparent images.

Based on a patch by Baptiste Coudurier <baptiste.coudurier@gmail.com>

lavd/qtkit: add device category

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavd/fbdev_enc: implement get_device_list

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

swscale: fix some undefined signed left shifts

Based on a patch by Michael Niedermayer <michaelni@gmx.at>

swscale: fix an implementation-defined unsigned-to-signed conversion

lavd: no default device unless explicitly set

AVDeviceInfoList was allocated with first device set as default
even though there is no device after allocation.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

avcodec/ffv1: use av_malloc_array()

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

avcodec/faxcompr: use av_malloc_array()

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

vcodec/error_resilience: use av_malloc_array()

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

doc: Libavfilter English cleanup

This aims to standardize the English used in the libavfilter
documentation, describing the same thing in the same way more often,
and significantly reduce the amount of outright errors, including
run-on sentences and sentence fragments.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

mp3enc: Properly write bitrate value in XING header

Instead of using a fixed bitrate_idx, calculate a matching bitrate for
the XING header.

Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1)
to report wrong bitrate and bitrate mode when using CBR.

Bug-Id: https://bugs.debian.org/736088

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

avcodec/elbg: Use av_malloc(z)_array()

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

avcodec/diracdec: use av_malloc(z)_array

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

avformat/img2dec: support nanosecond file times

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

avformat/hls: reduce memory usage by using dynamically allocated url/key

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

avcodec/mpegvideo_enc: override bitrate tolerance when its value is too small

Fixes Ticket3257

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

Merge remote-tracking branch 'cehoyos/master'

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

avcodec/jpegls: print coding parameters stored in LSE

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

Improve amr bitrate calculation for VBR files.

Fixes ticket #3541.

Warn if rawvideo and an unreadable pix_fmt are written.

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.

Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'

* commit '254c95cdd1b669a722204a4a65974fc2523c8f83':
  resample: split linear into its own function

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

Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'

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

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 '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'

* commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5':
  resample: reindent

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 'b9dea23766f52b8e059e72d34980bb7b456efe8f'

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

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

Add AVFoundation input device.

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

resample: split linear into its own function

resample: add initial padding explicitly

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

resample: drop useless abs()

negative sample_index is handled in the block above.

resample: reindent

resample: split the nearest neighbour path into a separate function pointer

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

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>

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>

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>

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

DNxHD: convert inline asm to yasm

DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride

DNxHD: K&R formatting cosmetics

avcodec/dnxhdenc: use av_malloc_array()

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

Merge remote-tracking branch 'qatar/master'

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

avcodec/mpegaudioenc_template: default to 384k bitrate as default

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

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

mp2: Do not force a samplerate

The default should be not to resample.

avformat/hls: do not call ffurl_seek/ffurl_size on crypto protocol

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>

ffmpeg: stop protocols on interrupt when no transcoding has happened yet

Fixes Ticket3344

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

Cosmetics: Remove an outdated comment from lavc/rawdec.c.

The missing swscale feature was implemented in 2011.

avfilter/settb: remove duplicate #include

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

lavf/rtspcodes: add missing header include

Fixes make checkheaders

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

Merge remote-tracking branch 'qatar/master'

* 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: 8945dcbb52b6b87e1e6479912cce89c7da54ec43
See: fcc43e02d30279b2ca4c69811311aa05acab4184
See: cdd21f1f03c5d59aad8f0244b1be0f864d8416a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mov: merge mov_read_custom_metadata() and mov_read_custom()

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

Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'

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

Conflicts:
libavformat/Makefile
libavformat/mov.c

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

avcodec/imgconvert: fix nb_components and depth for PAL8 in get_pix_fmt_score()

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>

libx265: Only set the SAR if it is valid

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Use 16-bit SAR

The spec says it is 16 bits.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/x86: Exclude broken get_cabac under icl.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libavfilter: Add asettb filter for setting timebase for audio

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/settb.c
libavfilter/version.h

See: ba856c0be5599f21f241162e1f5f3f2506f3132c and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libx265: Only set the SAR if it is valid

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Use 16-bit SAR

The spec says it is 16 bits.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Use x265_param_parse to set the SAR

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Use x265_param_parse to set the SAR

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

mov: read hydrogenaudio replaygain information

libavfilter: Add asettb filter for setting timebase for audio

Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.

Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

lavf/utils: fix mem leak

Calling avformat_free_context() right after avformat_alloc_output_context2()
leaved option's default values not freed.
Options were freed only in av_write_trailer().

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

sws: fix warning about RGB_PACK24_B_OPERANDS redefinition

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix a typo in amr.c.
  Remove an unneeded include of avassert.h from amr.c.
  Do not allow writing invalid wav channel layouts by default.

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

avcodec/mpegvideo_enc: change some asserts to av_asserts

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

avformat/nut: add ff_nut_audio_extra_tags to demuxer too

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

Fix a typo in amr.c.

Remove an unneeded include of avassert.h from amr.c.