Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Use os/2 palette even if it contains less than 256 entries.
  Assume that old bmps do not contain transparency information.
  Do not detect jp2 images as mov files.

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

Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'

* commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b':
  libfdk-aacdec: Reduce the default decoder delay by one frame

Conflicts:
libavcodec/version.h

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

Use os/2 palette even if it contains less than 256 entries.

Fixes 11Bios13.bmp.

Assume that old bmps do not contain transparency information.

Fixes MK50TEMP.BMP that has its RGB channel bit masks on the actual image.

Do not detect jp2 images as mov files.

libfdk-aacdec: Reduce the default decoder delay by one frame

The default error concealment method if none is set via
aacDecoder_SetParam(AAC_CONCEAL_METHOD) is set in
CConcealment_InitCommonData within the fdk-aac library
and is set to Energy Interpolation. This method requires one frame
delay to the output. To reduce the default decoder output delay and
avoid missing the last frame in file based decoding, use Noise
Substitution as the default concealment method.

Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>

Doxyfile: imitate gcc for better libavutil/attributes.h documentation

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

downmix_info: clarify doxygen

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

channel_layout: doxy: merge functions with macros

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Doxyfile: enable browser-based search engine

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil: fix version macros doxygen module

Without this patch, "Library Version Macros" module is not visible on
libavutil homepage in `make apidoc`.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf/libssh: call ssh_userauth_none before ssh_userauth_list

According to doc, ssh_userauth_none must be called before ssh_userauth_list.
It solves login issue for new versions of libssh.

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

avcodec/mlp_parser: check ff_combine_frame() return code

Fixes CID602338

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

avformat/img2dec: remove functions from image pipe which are unneeded for image pipes

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

avcodec/bmp: fix integer overflow in checking header sizes

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

avformat/img2dec: improve bmp probe

fix probetest failure

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

avformat/img2dec: increase probe buffer to 2k

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

configure: update dependencies for vf_spp

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

avformat/img2dec: set AVProbeData size correctly on corner cases of tiny files

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

avformat/img2dec: avoid seekback on probeing

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

avformat/img2dec: allocate and clear padding area for probe correctly

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

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/ftp: always treat all response codes >= 500 as error
  lavf/ftp: explicitly enable UTF-8
  lavf/ftp: make response parsing more RFC compliant

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

x86/swr: use lavu helper macros to check CPU extensions

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

Autodetect JPEG2000 imagess.

Autodetection of jp2 files does not work yet, the files are detected
as mov.

x86/swr: split audioconvert and rematrix DSP into separate files

Also rename resample_x86_dsp.c to resample_init.c

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

swr: initialize only the necessary resample dsp functions

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

lavf/ftp: always treat all response codes >= 500 as error

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

lavf/ftp: explicitly enable UTF-8

Most FTP servers enable UTF-8 by default, but it is not required by the standard.
Enabling it manually makes ffmpeg implementation more consistent when server
doesn't enable it by default.

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

lavf/ftp: make response parsing more RFC compliant

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

Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'

* commit '391ecc961ced2bde7aecb3053ac35191f838fae8':
  x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

Conflicts:
libavcodec/x86/mpegvideoenc.c

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

Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'

* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced':
  webpdec: Fix decoding of the huffman group indices.

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

Merge commit '9279826008b80daad7446950a821f32033ccd33f'

* commit '9279826008b80daad7446950a821f32033ccd33f':
  id3v2enc: use a case-insensitive comparison for APIC picture type

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

avcodec/dvdsubdec: fix alpha in debuging code

improve the debugging function for saving subtitles
to PPM files: Actually use the alpha channel.

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

avcodec/dvdsubdec: Fix off-by-one error

Fix an off-by-one error that causes the height of decoded
subtitles to be too small, thus cutting off the lowest row
of pixels.

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

x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'

* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
  daud: split muxer and demuxer

Conflicts:
libavformat/Makefile

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

webpdec: Fix decoding of the huffman group indices.

Per the specification, "The red and green components of a pixel
define the meta Huffman code used in a particular block of the ARGB
image."

Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'

* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0':
  ismindex: Add an option for outputting files elsewhere than in the current directory

Conflicts:
tools/ismindex.c

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

id3v2enc: use a case-insensitive comparison for APIC picture type

Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'

* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
  ismindex: Allow adding a path prefix to the generated .ism file

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

daud: split muxer and demuxer

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

ismindex: Add an option for outputting files elsewhere than in the current directory

Signed-off-by: Martin Storsjö <martin@martin.st>

ismindex: Allow adding a path prefix to the generated .ism file

This allows storing the .ismv/.isma/.ismc files separately from
the .ism file on a server, without having to manually edit the
.ism file after generating it with the ismindex tool.

Signed-off-by: Martin Storsjö <martin@martin.st>

avformat: Add image3 demuxers with format autodetection

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ivfenc: support VP9

libvpx tools accept vp9 ivf files

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

avfilter/vf_drawtext: fix resource leak

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

avformat/avformat: minor grammar improvement

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

Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'

* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
  lavf: document av_dump_format()

Conflicts:
libavformat/avformat.h

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

Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'

* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
  hevc: Use the local context variable when needed

Conflicts:
libavcodec/hevc.c

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

avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation

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

avfilter: add flanger filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/af_aphaser: move wave table generation code into separate file

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavf: document av_dump_format()

hevc: Use the local context variable when needed

avfilter/vf_format: Check pix_fmts before dereferencing it

Fixes CID1224286

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

avfilter/avfiltergraph: dont "or" together error codes

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

Fix standalone compilation of the wtv muxer.

avcodec/on2avc: Fix out of array access

Fixes CID1206648

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

Merge commit '98569d89638efc325042bd0081e9a02181afdafa'

* commit '98569d89638efc325042bd0081e9a02181afdafa':
  matroskadec: Fix a double negation typo

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

avcodec: Updated comment for sub param

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

avcodec/dvbsubdec: removed unnecessary null check for subtitle

In refrence to coverity defect 1224278

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

matroskadec: Fix a double negation typo

This typo has existed since this code was added in c16582579.
Newer versions of clang pointed out that this comparison always
was true (since the result of the negation is either 0 or 1, while
AVDISCARD_ALL has the value 48).

Signed-off-by: Martin Storsjö <martin@martin.st>

lavfi/overlay: show incoming frames on debug messages

This is especially useful to debug queue overflow issues.

Ideally we should be able to set the debug message at the
dualinput/framesync level, but they do not have the information related
to the filter context and the inlink, so cannot access much useful
information.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

avcodec/dvdec: remove redundant null check

Fixes CID700682 again

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

avcodec/bitstream: remove trivial assert

Fixed CID1224273

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

swr: rename swresample_dsp init functions to swri_resample_dsp

The swresample_ prefix is not for internal functions

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

doc/filters: fix typo

Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: check av_opt_set_dict() return

Fixes CID1224275

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

doc/ffprobe.xsd: fix order and missing elements/attributes

Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swr: remove obsolete resample prototypes

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

Partially revert "swr: add prototypes for resample dsp functions"

Prototypes are not needed anymore now that the x86 functions don't
include resample_template.c

The DO_RESAMPLE_ONE macro is removed for that same reason as well.

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

x86/swr: add ff_resample_{common, linear}_int16_xop

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

x86/swr: add ff_resample_{common, linear}_float_fma

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

x86: rename dsputil.asm to idctdsp.asm

Its only function is no longer part of dsputil.

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

avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch()

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

avcodec/mjpegdec: handle luma upscale detection generically

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

avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of hardcoding a list

Some code is left to handle corner cases

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

avcodec/mjpegdec: Support pix_fmt_id==0x11222200

Fixes: 4858286_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mjpegdec: fix width for non chroma in rescaling

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

mjpegdec: Support pix_fmt_id == 0x22112200

Fixes 4780490_300.jpg

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

Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'

* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4':
  matroska: Factor out mkv_write_stereo_mode

Conflicts:
libavformat/matroskaenc.c

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

Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'

* commit 'b75a1f9892b5b715397edbf837e4d4cda337907b':
  matroska: Factor out write_track from mkv_write_tracks

Conflicts:
libavformat/matroskaenc.c

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

Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'

* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e':
  matroska: K&R formatting cosmetics

Conflicts:
libavformat/matroskaenc.c

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

Merge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'

* commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a':
  vaapi: Update idct_permutation location after dsputil/idctdsp split

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

x86/swr: convert resample_{common, linear}_double_sse2 to yasm

Signed-off-by: James Almer <jamrial@gmail.com>
312531 -> 311528 dezicycles

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

matroska: Factor out mkv_write_stereo_mode

matroska: Factor out write_track from mkv_write_tracks

matroska: K&R formatting cosmetics

vaapi: Update idct_permutation location after dsputil/idctdsp split

Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'

* commit '20f95f21f9b9595608ba668a6eca78f2d508be67':
  mov: Support default-base-is-moof.

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

Merge commit '79793f833784121d574454af4871866576c0749d'

* commit '79793f833784121d574454af4871866576c0749d':
  Update Fiona's name in copyright statements.

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

Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context

Conflicts:
configure
libavcodec/aic.c
libavcodec/arm/Makefile
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/asvdec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dvdec.c
libavcodec/dxva2_mpeg2.c
libavcodec/intrax8.c
libavcodec/mdec.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc_common.h
libavcodec/mpegvideo.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

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

mov: Support default-base-is-moof.

default-base-is-moof shall be set to track fragments compatible with DASH
Media Segments. So, this is a fundamental support for ISOBMFF ver. DASH.
This is meaningful only when base-data-offset-present is absent and two or
more track fragments are present in a movie fragment.

Signed-off-by: Martin Storsjö <martin@martin.st>

Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'

* commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30':
  mjpeg: Split off bits shared by MJPEG and LJPEG encoders

Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h

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

Update Fiona's name in copyright statements.

avfilter/f_ebur128: Use av_malloc_array()

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

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

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

cmdutils_opencl: Use av_malloc_array()

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

avfilter/showcqt: adding freetype support

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

avdevice/xv: fix missing {

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