* commit 'c117da9d':
  lpc: remove unneeded {}

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

* commit 'bc75b64c':
  vc1pred: remove logically dead code

Conflicts:
	libavcodec/vc1_pred.c

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

Fixes Ticket4130

Requested and Tested by: Zeranoe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Include config.h from huffyuvdsp.h.
  Include stddef from snow_dwt.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

A cleaner fix is very welcome
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dshow_capture.h sets up various flags before including windows headers
this must occur before other headers (like os_support.h) include these
headers without the setup

This could be fixed differently but for now this fixes building on mingw
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

CC: libav-stable@libav.org
Bug-Id: CID 1245699 / CID 1245700

* commit '960aff37':
  lavf: Use wchar functions for filenames on windows for mkdir/rmdir/rename/unlink

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

* commit 'b9d08c77':
  lavf: Don't try to update files atomically with renames on windows

Conflicts:
	libavformat/dashenc.c
	libavformat/hdsenc.c
	libavformat/internal.h
	libavformat/smoothstreamingenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes a warning about undefined HAVE_BIGENDIAN when running make checkheaders.

Fixes make checkheaders.

* commit '40665d27':
  flvdec: Document how the duration is retrieved at the end of the file

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

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

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

These cases are not supported yet

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

This makes sure that the internal utf8 path names are handled
properly - the normal file handling functions assume path names
are in the native codepage, which isn't utf8.

This assumes that the tools outside of lavf don't use the mkdir
definition. (The tools don't do the same reading of command line
parameters as wchar either - they probably won't handle all possible
unicode file parameters properly, but at least work more predictably
if no utf8/wchar conversion is involved.)

This is moved further down in os_support.h, since windows.h shouldn't
be included before winsock2.h, while io.h needs to be included before
the manual defines for lseek functions.
Signed-off-by: Martin Storsjö <martin@martin.st>

On windows, rename(2) will fail if the target file exists. On
unix this trick is used to make sure that people reading the file
either will get the full previous file, or the full new version
of the file, but no intermediate version.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

In order to support multiple IDAT of fdAT chunks following an fcTL one,
transmit all the chunks between two fcTL ones (or between fcTL and IEND
one).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some raw demuxers already had AVFMT_NOTIMESTAMPS set. Add it for all the
others.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

works with (--enable-libxcb-shape)  and without (--disable-libxcb-shape) now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Based on: 065923b0Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fe42f94c':
  dashenc: Don't segment all video streams when one stream gets a keyframe
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6f26f14f':
  sidxindex: Write mimeType=audio/mp4 for audio-only representations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '208f3abb':
  aacsbr: always initialize max_qmf_subbands

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

* commit '55b59fab':
  roqaudio: Always use the frame buffer on flush

Conflicts:
	libavcodec/roqaudioenc.c

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

* commit '0562887a':
  tiffenc: initialize return value

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

* commit '299d8ab1':
  cook: Make sure there is enough extradata

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

* commit '30b8eb0f':
  sol: simplify sol_codec_id()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b99ca863':
  aacdec: avoid an out-of-bounds write

Conflicts:
	libavcodec/aacdec.c

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

* commit '277ff7f5':
  lavu: move internal define to the only places where it is used

Conflicts:
	libavcodec/h264_cabac.c
	libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '065923b0':
  mpegenc: prevent a NULL pointer dereference

Not merged, this is not needed, and could hide more serious issues
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9c12c6ff':
  motion_est: convert stride to ptrdiff_t

Conflicts:
	libavcodec/me_cmp.c
	libavcodec/ppc/me_cmp.c
	libavcodec/x86/me_cmp_init.c

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

This makes sure that segments actually start at a keyframe (and
makes sure we don't split segments twice in a row, with one segment
consisting of only a handful of packets), when one stream uses b-frames
while another one doesn't.
Signed-off-by: Martin Storsjö <martin@martin.st>

This fixes playback with dash.js, when the input is one separate
mp4 file per track.
Signed-off-by: Martin Storsjö <martin@martin.st>

Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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