* commit 'a1a25988':
  v4l2: Use av_strerror

Conflicts:
	libavdevice/v4l2.c

See: 60950adcMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e3e317e0':
  lavc: Compact the side-data passthrough

Conflicts:
	libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

use_mmx_vfilter check/fix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3762.

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

avcodec_copy_context leaves shallow copy of string/binary/dict options.
Double free/accessing freed memory may occur.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

It caused segfaults.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The generic decoder properly flushes the codecs with one null packet as well.
Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

Found-by: JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

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

This checks for audio+video instead of streams > 2
Fixes Ticket4090
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows selecting if the demuxer should consider all streams to be
found after the first PMT and add further streams during decoding or if it rather
should scan all that are within the analyze-duration and other limits

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

This reverts commit b1ad9312.

Fixes Ticket #3517

Conflicts:

	libavdevice/v4l2.c
Requested-by: Giorgio Vazzana <mywing81@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Remove fminf() emulation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9a5ac36b':
  movenc: Require samples before trying to write edts

Conflicts:
	libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The emulation is unused and causes compilation trouble on systems
where fminf() is defined in <math.h> but missing from libm.
This should fix compilation on Debian powerpcspe.

* commit '8cb7b7b4':
  movenc: Avoid leaking locally allocated data when returning on errors

Conflicts:
	libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '95a449d3':
  movenc: Remove an outdated comment

Conflicts:
	libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This avoids a potential crash if writing a fragmented psp mp4
(which probably is only a hypothetical scenario).
Signed-off-by: Martin Storsjö <martin@martin.st>

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

QuickTime does support files with an empty initial movie
these days.
Signed-off-by: Martin Storsjö <martin@martin.st>

new_output_stream creates a codec context with arbitraty picked codec.
Later data is updated, but priv_data are left alone.
There is a bit chance there is a mismatch between codecs.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

In matroska_read_seek(), |tracks| is assigned at the begining of the function.
However, functions like matroska_parse_cues() could reallocate the tracks so
that |tracks| can get invalidated.

This CL assigns |tracks| only before we use it so that it won't be invalidated.

BUG=427266
TEST=Test case in associated bug passes now.

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

* commit '9cbf70fa':
  movenc: Write correct presentation timestamps in tfra

Conflicts:
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e7d20f12':
  movenc: Remove a now redundant check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1d8a0c1b':
  movenc: Allow to request not to use edit lists

Conflicts:
	libavformat/movenc.c

See: 537ef8beMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '897d5c3a':
  lavf: Print a warning if failed to avoid negative timestamps when requested

Conflicts:
	libavformat/mux.c

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

* commit '1384df64':
  lavf: Add an option for avoiding negative timestamps

Conflicts:
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/options_table.h
	libavformat/version.h

See: 3ba0dab7
See: a89c0125Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4981baf9':
  avstring: Mark some character handling functions av_const
Merged-by: Michael Niedermayer <michaelni@gmx.at>

13797 decicycles in ff_float_to_int32_a_sse2, 32768 runs, 0 skips
8603 decicycles in ff_float_to_int32_a_avx2, 32766 runs, 2 skips
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

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

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

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