Merge commit '999ccd2d0a43640921088578f138c874f6cc0f8a'

* commit '999ccd2d0a43640921088578f138c874f6cc0f8a':
  tiff: cleanup the error paths

Conflicts:
libavcodec/tiff.c

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

Merge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde'

* commit '016c5b066de08a93a5f6b5beb0ef377356b35cde':
  tiff: refactor fax support in a separate function

Conflicts:
libavcodec/tiff.c

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

Merge commit '103937681d7e6afd3e8caf8937272575e450fb55'

* commit '103937681d7e6afd3e8caf8937272575e450fb55':
  tiff: refactor deflate support in a separate function

Conflicts:
libavcodec/tiff.c

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

Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'

* commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1':
  h264_parser: K&R formatting cosmetics
  vorbis: return meaningful errors

Conflicts:
libavcodec/h264_parser.c

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

avcodec/smvjpegdec: copy palette too

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not offer smvjpeg lowres capabilities, the decoder does not support it.

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

avcodec/smvjpegdec: check that frames_per_jpeg cleanly divides height

Fixes out of array access

If some valid files fail this check then please open a ticket and ping me and the smvjpegdec maintainer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Do not offer smvjpeg lowres capabilities, the decoder does not support it.

Reviewed-by: Ash Hughes

tiff: cleanup the error paths

Return the proper error values and optionally report them.

tiff: refactor fax support in a separate function

tiff: refactor deflate support in a separate function

Report when zlib support is missing.

h264_parser: K&R formatting cosmetics

vorbis: return meaningful errors

doc/filters: fix alias option name for chroma_mode in 'il' filter.

avformat/mov: compute dts_shift with trun cts

Some movies have negative composition time offsets in their trun, causing pts <
dts errors. This patch makes use of dts_shift to handle them.

Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>

cmdutils: print threading capabilities for audio codecs

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

smvjpegdec: only extract picture when a picture has been decoded.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tta: unbreak demuxing of files with id3 tags at start of file

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

tta: replace datalen with nb_samples

This is less confusing.

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

sonicenc: don't allocate unused avctx->coded_frame

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

pcmenc: don't allocate unused avctx->coded_frame

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

alacenc: don't allocate unused avctx->coded_frame

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

id3v2: read all textual chapter subframes

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

flvdec: Fix mistakenly discarding metadata at dts==0

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Fix the alphabetical ordering in registering depacketizers

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

Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22'

* commit '2681924b0f3f35840dd9d9825df9f9239c448b22':
  libavformat: Fix standalone compilation of the webm muxer

Conflicts:
libavformat/Makefile

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

lavfi/lut3d: add sanity checks.

Should fix CID1026775 and CID1026774.

Add unscaled converter from GBRP > 8bit to RGBx48/64.

Fixes ticket #2633.

Tested-by: Michael Cinquin

tiff: simplify picking right pixel format

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

lavc: add ONLY_IF_THREADS_ENABLED where it is missing

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

jpeg2000: Zero prec->cblk

Prevent use of uninitialized memory / valgrind failure

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

jpeg2000dec: fix av_log()

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

tiff: correctly decode saparate planes with horizontal differencing predictor

Closes #2648.

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

lavf/tee: pesudo → pseudo.

lavfi/il: add timeline support

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

lavfi/framestep: cosmetics: reindent AVFilter

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

lavfi/framestep: add timeline support

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

rtpdec: Fix the alphabetical ordering in registering depacketizers

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

libavformat: Fix standalone compilation of the webm muxer

The missing object file was added to the matroska muxer already, but
not to the webm muxer.

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

APIchanges: Add missing entry for SHA-2 512

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

ffprobe: show chapter and chapter metadata information

Address trac ticket #2636.

jpeg2000dec: check that we have enough components for MCT

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

jpeg2000dec: Use the matching coding style struct for transform selection

Fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf/hlsenc: fix bogus hls segment index rewrapping logic

The counter should not be reset since it detects the
hls segment increasing timeframe.

Fixes ticket #2643.

Reviewed-by: Stefano Sabatini

jpeg2000dec: Check that theres a SOT before SOD

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

jpeg2000dec: Support 4 tile parts

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

flacdec: don't call allocate_buffers() in init_thread_copy() when s->max_blocksize is 0

This is normal, and happens when no extradata was available at decoder
initialization.

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

get_qcc: Check compno

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

alac: frame multi-threading support

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

wavpack: frame multi-threading support

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

ttadec: frame multi-threading support

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

flacdec: frame multi-threading support

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

takdec: frame multi-threading support

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

audio frame multi-threaded decoding

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

MAINTAINERS: add fingerprint of the FFmpeg release signing key

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

jpeg2000dec: return error for invalid cdxy values

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Changelog: add missing entries about new mcdeint and sab filters

jpeg2000: Make nreslevel fields int

This prevents potential integer overflows

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

jpeg2000dec: Propagate error code from get_cox() correctly

Without this the context state could become inconsistent

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

jpeg2000: check that nreslevels2decode has been initialized before use

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/img2dec: timestamps are 64bit

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

avutil/mem: simplify av_reallocp_array() by using av_realloc_f()

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

avformat/network: remove unused variable

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  apetag: use int64_t for filesize

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

Merge commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c'

* commit '274e134e49b1c92db0f0b8cb2ae7554fb7b9184c':
  avconv: check that the output format context exists before accessing it

Conflicts:
ffmpeg.c

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

Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'

* commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff':
  lavfi doxy: improve/extend AVFilter doxy.

Conflicts:
libavfilter/avfilter.h

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

Merge commit '9835abb6d63fb07613994ae90e72fef758149408'

* commit '9835abb6d63fb07613994ae90e72fef758149408':
  network: uniform ff_listen_bind and ff_listen_connect

Conflicts:
libavformat/network.c
libavformat/tcp.c

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

Merge commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44'

* commit '7c020e1ad37d27c9d5db4d714401f09c80e3cc44':
  movenc: Grow the frag_info array in chunks

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

Merge commit 'ab1189766a82a95f108005463cde75f73fcc0ae5'

* commit 'ab1189766a82a95f108005463cde75f73fcc0ae5':
  movenc: Increase the cluster array allocation by doubling

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

Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

Conflicts:
doc/APIchanges
libavformat/movenc.c
libavutil/mem.c
libavutil/mem.h
libavutil/version.h

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

doc/encoders: add documentation for libtwolame

swr: dont treat 32 and 24 as equal in simple copy check

Fixes dithering from 32 to 24 bit

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

swr: set scale for 32->32/24 dither

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

lavfi/mp: remove mp=sab

The filter was ported to a native libavfilter filter.

lavfi: port sab filter from libmpcodecs

swresample: set flags & description and add documentation for output_sample_bits

Allows users to actually use such option.

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

swr: Fix dithering of s16 with SIMD

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

swr: add native_simd_one

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

doc/general: update after e4e4add0e3ba7

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

pngdec: dont treat mpng like png with key and non keyframes

Fixes Ticket2618

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

Use av_log() instead of fprintf() in ffplay.

Fixes ticket #2630.

Reviewed-by: Marton Balint

tak: simplify ff_tak_check_crc()

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

apetag: use int64_t for filesize

CC: libav-stable@libav.org

avconv: check that the output format context exists before accessing it

Fixes a segfault in exit_program() if opening an output file fails.

lavfi doxy: improve/extend AVFilter doxy.

swresample/rematrix: add S32 mixing code

Needed for dithering S32

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

wresample/rematrix_template: fix internal types

Should make no difference, but future commits will need it

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

network: uniform ff_listen_bind and ff_listen_connect

Document the functions and have both use a millisecond timeout and
check for interrupt.

movenc: Grow the frag_info array in chunks

Previously it was grown one element at a time, which leads to
excessive reallocations.

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

movenc: Increase the cluster array allocation by doubling

The previous allocation increment of 16384 meant that the cluster
array was allocated for 0.6 MB initially, which is a bit excessive
for cases with fragmentation where only a fraction of that ever
actually is used.

Therefore, start off at a much smaller value, and increase by
doubling (to avoid reallocating too often when writing long
non-fragmented mp4 files).

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

movenc: Keep track of the allocated size for the cluster array

When writing fragmented mp4, the cluster array is reset when a
fragment is written. Instead of starting off reallocating the
array only based on the number of current elements in it, keep
track of how many elements there were allocated earlier.

This avoids reallocating this array needlessly when writing
fragmented mp4 files.

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

mem: Add av_realloc_array and av_reallocp_array

These help avoiding overflows and simplify error handling.

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

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  ftp: fix using uninitialized value

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

ffserver: fix null pointer dereference

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

ftp: fix using uninitialized value

Fix coverity issue CID 1026777

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

vc1dec: Disable dead code

Fixes CID732197/6

A assert is added to check that the disabled code wont
be needed in the future.

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

lavf/aacdec: add support for reading ape tags

Closes #2634.

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

tta: add support for reading ape tags

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

tta: return meaningful error codrs

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

flacdec: use init_get_bits8()

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