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

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

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

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

avcodec/msrledec: restructure msrle_decode_pal4() based on the line number instead of the pixel pointer

Fixes out of array access
Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP

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

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

Note, Vittorio Giovara had submitted a very similar fix to me privately
a few hours before this, iam applying Jochens because it comes with a
commit message too and i had not yet applied Vittorios, but For sake
of credit, Vittorio independently solved this first

* cehoyos/master:
  lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '11881196':
  avisynth: update documentation about the avisynth_c.h header

Conflicts:
	doc/general.texi

Not merged as FFmpeg provides the needed headers in compat/
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a8c99205':
  avisynth: Fix compilation against current 2.6 header(s).
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

AviSynth 2.6 (and by extension, AviSynth+) moves these functions
into AVSC_API. This requires both adjusting their normal use,
and for AvxSynth, adjusting the position/use of the USING_AVISYNTH
ifdefs.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Fixes remuxing of DVBSUB to mkv.

Reported-by: Bostjan Hamler

* commit '1ddd3e23':
  vaapi_h264: fix slice data offset

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

* commit 'ae4f5d94':
  dxva2_h264: fix slice offset in long slice structs

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

* commit 'b21af32a':
  lavc: Prefer x264 over openh264 if both libraries are available

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

* commit '312a9ef0':
  pixfmt: Update documentation with prefixed pixel formats

Conflicts:
	libavutil/pixfmt.h

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

* commit '592a0405':
  pixdesc: Replace a few leftover instances of non AV-prefixed flags

Conflicts:
	libavutil/pixdesc.c

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

* commit '7419b348':
  fate: Add test for tscc2 in mov
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e4fe535d':
  mov: Write the display matrix in order

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

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Rename the existing tscc2 test.

This will allow to copy the matrix as is and it is just cleaner to keep
the matrix in the same order specified by the mov standard (which is
also explicitly described in the documentation).

In order to preserve compatibility, flip the angle sign in the display API
av_display_rotation_set() and av_display_rotation_get(), and improve the
documentation mentioning the rotation direction.

* commit 'e0046bc9':
  movenc: Write the make and model metadata keys for mov style files

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

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

The initial spaces get ignored anyway so let's be consistent with other docs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These are essential allowing QuickTime to keep detecting content
as slow-motion - this allows preserving them on stream copy.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

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