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

* commit 'ca5c3ff9':
  vf_interlace: x86: improve asm performance

Conflicts:
	libavfilter/x86/vf_interlace.asm

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

* commit '57ed5a64':
  hnm4: change width/height to int to fix hypothetical integer overflows

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

* commit '16158da9':
  hnm4: Use av_image_check_size

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

* commit '51946d2d':
  vc1: Use the correct shift amount

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

* commit 'd25afb57':
  vc1: Set the is_intra bitfield to all 1 when needed

Conflicts:
	libavcodec/vc1_block.c

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

* commit 'b6713859':
  vc1: Simplify a little setting the intra variables

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

* commit '62e52b94':
  vorbis_parser: Move vp check to avoid a null pointer dereference

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

* 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>

4775 decicycles -> 3688 decicycles

CC: libav-stable@libav.org
Bug-Id: CID 1135770 / CID 1135771

As done for all the other codecs not calling it indirectly.

CC: libav-stable@libav.org
Bug-Id: CID 1135770 / CID 1135771

`is_intra` is a 6bits bitfield.

CC: libav-stable@libav.org
Bug-Id: CID 1194380 / CID 1194381
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Keep the code as similar as possible across the codepaths to
ease spotting it for factorization.

Based on a patch from Michael Niedermayer <michaelni@gmx.at>.

The code currently set the information in at least 4 places, spare
some pointless loops.

Make the code in the loop a little uniform to make easier factorize
it out later.

CC: libav-stable@libav.org
Bug-Id: CID 1251347

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>