avcodec/vmdvideo: remove unneeded include

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

avformat/segment: simplify localtime* use

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

avformat/segment: Support cutting at clocktime

Signed-off-by: Deti fliegl <fliegl@baycom.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avdevice/lavfi: allow non-mmappable files for graph_file

Use av_bprint_fd_contents() instead of av_file_map()

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

avutil/bprint: Add av_bprint_fd_contents()

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

Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'

* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
  vmd: Split audio and video decoder

Conflicts:
libavcodec/vmdvideo.c

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

vmd: Split audio and video decoder

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

avcodec/cljrdec: remove unneeded include

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

Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'

* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
libavcodec/mpegvideo_enc.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>

Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'

* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d':
  dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c

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

Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'

* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94':
  dsputil: Split off *_8x8basis to a separate context

Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc_mmx.c

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

avcodec/mpegvideo_enc: fix b frame strategy 2

Fixes Ticket3757

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

transcoding: fix Doxygen file path

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

avcodec/mpegvideo: small indent fix in vismv code

avcodec: make vismv option as flag types

This allows for example -vismv pf+bf+bb instead of -vismv 7.

avcodec/roqvideodec: set JPEG output color range

Signed-off-by: Eric Lasota <ejlasota@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'

* commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6':
  audio_fifo: Split into a separate doxygen module

Conflicts:
libavutil/audio_fifo.h

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

Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'

* commit 'd69243d39b773b64614792487cd93f6ceb237b25':
  samplefmt: Add doxygen categories

Conflicts:
libavutil/samplefmt.h

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

Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'

* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
  dsicin: Split audio and video decoder

Conflicts:
libavcodec/Makefile
libavcodec/dsicinvideo.c

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

dsputil: Move draw_edges() to mpegvideoencdsp

Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'

* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
  bmv: Split audio and video decoder

Conflicts:
libavcodec/bmvvideo.c

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

avcodec/roqvideo: use JPEG color range

Signed-off-by: ejlasota <ejlasota@gmail.com>
Also update fate test checksums
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

dsputil: Split off *_8x8basis to a separate context

swresample: organize functions into doxy groups

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

swresample: better doxy for configuration-returning functions

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

swresample: improve Doxygen introduction

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

swresample: add SwrContext doxy

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

swresample: add SwrDitherType doxy

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

swresample: group all the option constants in a section in doxy

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

swresample: grammar/capitalization fixes

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

avutil: actually install hash.h

This header is designed as a public header (with APIchanges entry and
everything), but it is forgotten to put into the headers to be installed
list.

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

audio_fifo: Split into a separate doxygen module

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

samplefmt: Add doxygen categories

Categorize the enum and functions as "audio-related".

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

x86/svq1enc: use unaligned mov on SSE2

Might fix fate failures on some systems

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

dsicin: Split audio and video decoder

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

Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3'

* commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3':
  paf: split audio and video decoder

Conflicts:
libavcodec/pafvideo.c

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

Merge commit '373a6dda5422186bc057297342a9e559a564595e'

* commit '373a6dda5422186bc057297342a9e559a564595e':
  cljr: split decoder and encoder

Conflicts:
libavcodec/Makefile
libavcodec/cljrdec.c

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

bmv: Split audio and video decoder

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

Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'

* commit '02a7a5e330ec4373a761f63c292220a1de13b968':
  vc1test: Check malloc call

Conflicts:
libavformat/vc1test.c

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

Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e'

* commit '77fc7b76726719746ca45df6c4a62c41abad506e':
  vc1test: Return proper error codes

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

Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd'

* commit '865461099e062de5a3a109c2a5be98004c11d8bd':
  librtmp: Don't free the temp url at the end of rtmp_open

Conflicts:
libavformat/librtmp.c

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

paf: split audio and video decoder

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

cljr: split decoder and encoder

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

vc1test: Check malloc call

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

vc1test: Return proper error codes

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

librtmp: Don't free the temp url at the end of rtmp_open

librtmp can keep pointers to this string internally, and may
use them at shutdown as well.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

avfilter/vsrc_cellauto: Use av_mallocz_array()

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

avfilter/vf_vignette: Use av_malloc_array()

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

avfilter/unsharp_opencl: use av_mallocz_array()

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

avformat/smoothstreamingenc: fix memleak

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

swresample: split option table to a separate file

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

avcodec/mjpegenc_common: Restore removed copyright statements

These where removed by  libav while spliting the file in adcb8392c9b185fd8a91a95fa256d15ab1432a30

See: de6d9b6404bfd1c589799142da5a95428f146edd
See: 723106b279d9d78f5966f32bedfa33b88a702f69

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

avutil/audio_fifo: split into a separate doxy module

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

avcodec/Makefile: add libutvideo.h to SKIPHEADERS

libutvideo.h is not a C header and thus fails building as a C file

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/samplefmt: improve doxygen

Categorize the enum and funcs to "Audio related".

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

avcodec/old_codec_ids: workaround doxygen inclusion bug

Currently, http://ffmpeg.org/doxygen/trunk/group__preproc__misc.html is
broken, because of inclusion bug in Doxygen's preprocessing mode. The
now-unincluded header file is included anyway in avcodec.h, the only
place where it is used, so there should be no problem removing it.

One concern is API-compatibility, because old_codec_ids.h is a public
header. However, IMO this is not a problem because currently users
cannot include only this header and not `avcodec.h` anyway, because of
missing AV_CODEC_ID_NONE symbol.

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

x86/svq1enc: port ssd_int8_vs_int16 to yasm

Also add an SSE2 version

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

Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'

* commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b':
  x86: build: Only compile FDCT code if MMX is enabled

Conflicts:
libavcodec/x86/Makefile

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

Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'

* commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc':
  x86: Unconditionally compile blockdsp and svq1enc init files

Conflicts:
libavcodec/x86/Makefile

blockdsp_mmx is renamed to blockdsp_init as we already have a blockdsp file
and _init is how all other such files are called

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

avfilter/haldclut: fix R/B swap in CLUT loading

Fixes Ticket #3751.

Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'

* commit '009331303a6462d07cbe94aef9c446f1a1695519':
  x86: huffyuvdsp: Move inline assembly to init file

Conflicts:
libavcodec/x86/Makefile
libavcodec/x86/huffyuvdsp.h
libavcodec/x86/huffyuvdsp_init.c
libavcodec/x86/huffyuvdsp_mmx.c

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

x86: build: Only compile FDCT code if MMX is enabled

All other files containing purely inline assembly are treated the same way.

x86: Unconditionally compile blockdsp and svq1enc init files

This avoids a link failure with MMX disabled as the init functions
are referenced unconditionally.

x86: huffyuvdsp: Move inline assembly to init file

This avoids a link failure with MMX disabled as now code and
initialization are compiled under the same condition.

Fix standalone compilation of the amv encoder.

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>

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

This is useful for debugging purposes.

lavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structure

Slightly simplify.

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>