* commit 'a1e2caa9':
  mov: Log format rather than fourcc in stsd in trace mode

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

* commit '2eef75fd':
  mov: Adjust variable types to fix format warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'df22e301':
  dump: Use the correct abs() version
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0d449c81':
  lavfi: Add library identifier

Conflicts:
	libavfilter/version.h

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

* commit '0f87f9b4':
  lavd: Add library identifier

Conflicts:
	libavdevice/version.h

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

* commit '3f872c9b':
  lavc: Add missing API guard to dtg_active_format option
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d1229da':
  g2meet: Add FATE tests for all three G2M variants
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '08c2d8f0':
  Go2Meeting decoder

Conflicts:
	Changelog
	libavcodec/g2meet.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e2bd03a1':
  fate: Avoid unnecessary pixel format conversions

Conflicts:
	tests/fate/image.mak
	tests/ref/fate/dds-ya
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes out of array access
Fixes: signal_sigsegv_3670fc0_2818_cov_2307326154_moon.mux

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

This will fix remaining format warnings.

Fix warning from clang "absolute value function 'abs' given an argument
of type 'long long' but has parameter of type 'int' which may cause
truncation of value [-Wabsolute-value]".

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

ELS and ePIC decoder courtesy of Maxim Poliakovski,
cleanup and integration by Diego Biurrun.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

If threading is used, the first (thread_count - 1) packets are read
before any frame/error is returned. Counting this as successful decoding
is wrong, because it also happens when no single frame could be decoded.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

This is the second part of the fix for ticket #4370.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

This is the first part of the fix for ticket #4370.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

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

* commit '271ce76d':
  h264: Parse registered data SEI message and AFD value

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_sei.c
	libavcodec/version.h

See: d6e95669
See: 22291c37Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0bfab80a':
  h264_sei: Group error check outside the switch block

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

* commit '0a49a62f':
  h263: Always check both dimensions

Conflicts:
	libavcodec/ituh263dec.c

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

Most of the fate-dds-* and fate-txd-* tests already
output into the same pixel format regardless of
platform endianness, so there's no need to force
conversion to another format.

This fixes the tests fate-txd-16bpp, fate-txd-odd,
fate-dds-rgb16, fate-dds-rgb24 and fate-dds-xrgb on
big endian, where the tests seem to fail due to issues
with certain conversion codepaths in swscale.

Those conversion codepaths should of course be fixed, but
the individual decoder tests should use as little extra
conversion steps as possible.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '6f4cd33e':
  cosmetic: Reformat ff_h263_decode_mba
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e95c7a61':
  mov: Preserve the metadata even when bit-exactness is requested

Conflicts:
	libavformat/movenc.c
	tests/ref/vsynth/vsynth1-mpeg4
	tests/ref/vsynth/vsynth2-mpeg4

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

* commit '303ec065':
  aic: Fix slice size computation for widths multiples of 32 macroblocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3e3056f2':
  h264: Allow stream and container cropping at the same time

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

Partially based on code by Marton Balint and Kieran Kunhya.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

CC: libav-stable@libav.org
Found-By: ago@gentoo.org

Make sure to not write the custom `encoder` string in that case.

Bug-Id: 845
CC: libav-stable@libav.org

CC: libav-stable@libav.org

The container cropping is applied only when difference is within 16
pixels, and the smallest value between the two is chosen.

Bug-Id: 383
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>