* commit 'e7c5e17d':
  vda: Make output CVPixelBuffer format configurable

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

* commit '3b5e5e6a':
  libx265: Use the Multi-library Interface

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

* commit '85ca012b':
  mjpegenc: Fix JFIF header byte ordering

Conflicts:
	libavcodec/mjpegenc_common.c

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

* commit 'd84429d4':
  dnxhd: Print unknown header when found
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8fc11abe':
  mkv: Print unsupported mov tags when found

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

Skip 512 byte sectors until a non zero resolution is found
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0348e74c':
  quickdraw: Skip the empty 512 byte header for images

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

* commit 'd0dce15d':
  quickdraw: Make the palette opaque

Conflicts:
	libavcodec/qdrw.c

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

This fixes a memleak if read_kuki_chunk is executed more than once.
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

If avio_read fails, the buffer can contain uninitialized values.
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

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

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

This is useful for client programs to ask for nv12 surfaces instead of the
current default (uyvy), since those are more efficient to decode to.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

Use the Multi-library interface to load at runtime x265 libraries
supporting alternative bit depths (e.g. 8bit and 16bit).

The linked library will try to load the library supporting the
pixel format if it is not supported by itself.

Fallback requesting the native library (passing 0 to x265_api_get) if
a library supporting the requested bit depth is not available.
Signed-off-by: Gopu Govindaswamy <gopu@multicorewareinc.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

If that ever was untrue, there would be a bug in the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1271791 #7-6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This fixes nothing but maybe helps coverity which does not see that this is failing later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Fixes CID1239099 part 2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1239099 part 1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This partly undoes 7b35a01f.

The intent of patch 7b35a01f was to no longer use build_date and
build_time as attributes of programVersion, but the patch also had the
effect of making all records generated with an earlier ffprobe build with
build_date and build_time as invalid.

This patch puts the two attributes back but without mandating their use,
thus older ffprobe records as backwards compatible with the current
schema and their use is no longer required.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

This makes the XSD valid again. Fixes a regression from a72b61a3.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

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

libswscale/x86/hscale_fast_bilinear_simd.c: Include BX in the clobber list on x86_64, because it isn't implicitly included when PIC is on.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1.Option -march=loongson3a conflicts with -mips64 or -mips64r2.
2.Option -mhard-float has been removed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

av_image_fill_pointers always aligns the palette, but the padding
bytes don't (and can't) get initialized in av_image_copy.

Thus initialize them in av_image_alloc.

This fixes 'Syscall param write(buf) points to uninitialised byte(s)'
valgrind warnings.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

got_frame_ptr is set again after the if block.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes: CID1197065
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Since commit 676a395a aac->frame->data is not necessarily allocated at
the end of aac_decode_frame_int if avctx->channels is 0.

In this case a bogus frame without any data, but non-zero nb_samples is
returned.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1297587, CID1297586, 1297585
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes division by 0
Fixes CID1297575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The 4th planes is currently unused as no formats with alpha are supported yet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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