avcodec/mlp_parser: check ff_combine_frame() return code

Fixes CID602338

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>
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>
Doxyfile: enable browser-based search engine

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>
downmix_info: clarify doxygen

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
Do not detect jp2 images as mov files.
Assume that old bmps do not contain transparency information.

Fixes MK50TEMP.BMP that has its RGB channel bit masks on the actual image.
Use os/2 palette even if it contains less than 256 entries.

Fixes 11Bios13.bmp.
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>
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>
lavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structure

Slightly simplify.
tools/ffeval: print computed value even in case of error

This is useful for debugging purposes.
doc/protocols: document unit of timeouts for ftp and http

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Fix standalone compilation of the amv encoder.