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

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>

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

Fixed CID739860
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 CID1108608
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Partially suggested-by Burek Pekaric <burek021@gmail.com>.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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>

* commit 'afa93d19':
  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>

Conflicts:
	libavcodec/hevc.c

User may cut off a weird position and send a packet from there.
This avoids returning as invalid data immediately.

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

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>

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

err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

ANSI/ISO C guarantee this, yet there is evidence that there exist
platforms where its not so.
See: http://www.cs.utah.edu/dept/old/texinfo/glibc-manual-0.02/library_30.htmlSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  fft-test: add a missing #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b284e1ff':
  mem: do not check for negative size
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes: http://m1.file.xiami.com/282/23282/343749/1769075752_709488_l.mp3Based-on-patch-by: Crossle Song <sxm@yixia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

this might fix Ticket2999 as well as some fate clients
untested as the original patch submitter no longer has the environment to test
this should be reverted if it does not fix the issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cus/stable:
  ffplay: add support for libswresample options
  ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
  ffplay: factor out picture freeing code
  ffplay: update and extend documentation for channel and stream switching
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

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

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* lukaszmluki/master:
  lavd/pulse_audio_enc: avoid vars in for()
  lavd/pulse_audio_enc: add another default to stream name
Merged-by: Michael Niedermayer <michaelni@gmx.at>

stdio.h needed for printf since 7177df90

size_t is guaranteed to be unsigned
Signed-off-by: Anton Khirnov <anton@khirnov.net>

* qatar/master:
  fate: aac: Add test for AAC-ELD
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'adea4512':
  aacdec: Fix calls to avpriv_report_missing_feature().

See: 435a730e
See: 72cf47b2Merged-by: Michael Niedermayer <michaelni@gmx.at>