lavu/parseutils: add av_get_known_color_name()
cmdutils: add -colors option
avcodec/error_resilience check error_concealment, not err_recognition.

err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/flacdec: also do crc check when er compliant is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
FATE: update HEVC tests

This changes the tests that used the internal hevc checksum to use framecrc

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	tests/fate/hevc.mak
	tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
	tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
	tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
	tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
	tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
	tests/ref/fate/hevc-conformance-POC_A_Bossen_3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog: add entry for HEVC support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
hevc: Search start code in decode_nal_units().

User may cut off a weird position and send a packet from there.
This avoids returning as invalid data immediately.
hevc_parser: Set pict_type, key_frame and output_picture_number.

Conflicts:
	libavcodec/hevc.c
Merge commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a'

* commit 'afa93d198aaf2cc661c4df6d4095cd030265d30a':
  hevc_parser: Set pict_type, key_frame and output_picture_number.
  hevc: Search start code in decode_nal_units().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/hevcpred_template: Fix integer overflows

signed integer overflow is undefined in C

Fixes the following gcc warnings:
In file included from libavcodec/hevcpred.c:27:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_8’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:31:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_9’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]
In file included from libavcodec/hevcpred.c:35:0:
libavcodec/hevcpred_template.c: In function ‘intra_pred_10’:
libavcodec/hevcpred_template.c:302:9: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MAINTAINERS: add my name for Launchpad

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
doc/protocols/rtp: apply misc fixes

Partially suggested-by Burek Pekaric <burek021@gmail.com>.
doc/encoders: add libshine doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
avcodec/tiff: Fix use of uninitialized off variable

Fixes CID1108608

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/tiff: remove TIFF_LONG special case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/tiff: factorize offset init code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/vc1_parser: check ff_vc1_parse_frame_header*() return value

Fixed CID739860

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
vcodec/vc1dec: remove dead code

Fixes CID732196

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/overlay: correct small error in intersection detection

The image size of the destination image was used to determine if a source
image was positioned outside the destination image, that no intersection
could occur.  Actually for these two cases the size of the source image
has to be used!

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
avcodec/x86/videodsp: fix a bug in a %if statement where we used '%%' instead of '&&'.

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