avformat/gif: fix final_delay unit in documentation.
doc/muxers: document animated GIF muxer.
avformat/img2enc: simplify split planes extension selection.
avformat/mpegvideodec: check seq headers more completely during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fix compilation with os2threads

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/unsharp: added optimized opencl kernels

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'

* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove #undefs for formerly forbidden system functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dvdsubdec: remove exit() call in debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mov: only force parsing for video tracks if stss is empty

Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dsputil: Split off H.263 bits into their own H263DSPContext
h263dsp: K&R formatting cosmetics

Also remove array element numbering comments.
avformat/idcin: check the decompressed frame size during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
metasound: Fix error message argument

Signed-off-by: Diego Biurrun <diego@biurrun.de>
avformat/lvfdec: check stream count during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'

* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
	configure
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h263dsp: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/icodec: reduce score returned on probing

The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/vmdav: use av_freep() and reset unpack_buffer_size

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