* commit '3526ab89':
  qt-faststart: Undefine fseeko/ftello before defining them
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1019b7c4':
  os_support: Undefine lseek/stat/fstat before defining them

Conflicts:
	libavformat/os_support.h

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

* commit '051aadee':
  ogg: Provide aliases for Speex, Opus and audio-only ogg

Conflicts:
	Changelog
	libavformat/oggenc.c
	libavformat/version.h

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

* commit 'cb7b1a2d':
  electronicarts: set the framerate for TGQ/TQI
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7b6aae23':
  electronicarts: read the framerate for MAD
Merged-by: Michael Niedermayer <michaelni@gmx.at>

In some cases, in particular if several blocks are needed because of
the channel layout (e.g. 2.1), the information used to write the
trailing bits terminating the sample data was not reset.

This would cause potential desync on the decoder, although decoded
samples were actually mostly fine.

Fixes ticket #3879.

This means container and codec disagree. The codec is supposed to
know better so this could be an error instead.

* commit '4d6c5152':
  electronicarts: do not fail on zero-sized chunks

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

* commit 'dc4b2e7d':
  rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b0bfd09f':
  configure: Suppress "potentially uninitialized variable" warnings from MSVC

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

This avoids a number of redefinition warnings on MinGW64.

This avoids a number of redefinition warnings on MinGW64.

The stride for some buffers is known.
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The dststride parameter is always MAX_PB_SIZE.
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Since they are aliases for ogg enabling any of them enables ogg as well.

Reviewed-by: Mickaël Raulet <mraulet@gmail.com
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It is hardcoded to 15fps.

At least one FATE sample contains such chunks and happens to work simply
by accident (due to find_stream_info() swallowing the error).

CC: libav-stable@libav.org

MpegEncContext based decoders are only fully initialized after the first
ff_thread_get_buffer() call. The RV30/40 decoders may fail before a frame
buffer was requested. ff_mpeg_update_thread_context() fails on half
initialized MpegEncContexts. Since this can only happen before a the
first frame was decoded there is no need to call
ff_mpeg_update_thread_context().

Based on patches by John Stebbins and tested by John Stebbins.

CC: libav-stable@libav.org

It was only validating that normal data wasn't filling the buffer.
However, extra data may be written afterwards.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Currently, the encoder will try to reduce it down to 150000, but the
decoder will complain starting at 131072 (WV_MAX_SAMPLES). Therefore,
change the loop limit.

Fixes ticket #3881.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes null pointer dereference
Fixes: ficvf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Buffers containing copies of the AAC and AC3 header bits were not padded
before parsing, violating init_get_bits() buffer padding requirement,
leading to potential buffer read overflows.
This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer
for parsing the header in each of aac_parser.c and ac3_parser.c.

Based on patch by: Matt Wolenetz <wolenetz@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It was added per pixel instead of per line.
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some streams were found to have what appeared to be truncated SPS.
Their syntax seem to be valid at least until the end of the VUI, so
try that syntax if the parsing would overflow the SPS in the
conforming syntax.

Fixes ticket #3872.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '13c90bc9':
  adts: Return more meaningful error codes

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

* commit '593aaee9':
  setpts: Add missing inttypes.h #include for PRId64

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

* commit '8fc6a70c':
  mpeg12enc: Add missing #include for PICT_FRAME

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

* commit '7cb66ebc':
  error_resilience: Drop asserts from guess_mv()

Conflicts:
	libavcodec/error_resilience.c

Not merged, the asserts in FFmpeg build and work fine
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '11cd727f':
  vsrc_movie: Adjust a silly typo from b977b287

Conflicts:
	libavfilter/src_movie.c

No change, the typo is not part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* Reduced xmm register count to 7 (As such they are now enabled for x86_32).
* Removed four movdqa (affects the sse2 version only).
* pxor is now used to clear m0 only once.

~5% faster.
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

bytestream2_* will not cause buffer overflow, but in that case, this means
the allocation would be incorrect and the encoded result invalid. Therefore,
assert no overflow occurred.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The same is done for GCC and clang already.

Fixes integer overflow
Fixes Ticket 3866
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

In particular, allow pad_len and whole_len to have value set to 0, which
means that no padding will be added. Previously a value set to 0 meant
that that the filter had to pad forever.

The new semantics is clearer, also simplifies scripting since the option
value might be automatically computed, so that no checks need to be done
in case it is 0.

The old semantics was never documented and the logic was broken (the
filter was always adding samples indefinitely), so this should not break
backward compatibility.

With huge sampling rates, the table derivation method does not converge fast
enough. While fixing it using e.g. Newton-Rhapson-like methods (the curve is
nicely convex) is possible, it is much simpler to reject these cases.

The value of 96000 was arbitrarily chosen as a realistic value, though
1000000 would still work and converge.

Fixes ticket #3868.
Suggested-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>