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

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

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

Fixes Ticket3083
Signed-off-by: NMichael 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: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NLukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: NMichael 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: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

Reviewed-by: NLou Logan <lou@lrcd.com>
Signed-off-by: NMichael 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: NMichael Niedermayer <michaelni@gmx.at>

stdio.h needed for printf since 7177df90

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

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

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

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

* commit '4d6ee072':
  libavutil: x86: Add AVX2 capable CPU detection.

Conflicts:
	libavutil/cpu.c
	libavutil/cpu.h
	libavutil/x86/cpu.c

See: 865b70bcMerged-by: NMichael Niedermayer <michaelni@gmx.at>

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

Fixes out of array accesses
Fixes Ticket3080
Found-by: ami_stuff
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NLukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: NLukasz Marek <lukasz.m.luki@gmail.com>

This ensures that frames do not get mixed on context reinits

Fixes Ticket2836
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

avformat/rtpproto: when local rtp port and local rtcp port are not specified, try to make two successive ports and retry 3 times when failed

some video players on Android will not send udp hole punching messages if the rtcp port and rtp port are not two successive integers.
So, if the video player is behind NAT, it could not receive and rtp messages via udp
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

It does not take log level as an argument.

Patch based on x264's AVX2 detection
Signed-off-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

Do not consider it an error if we have no frames and should discard one.
This condition can easily happen when decoding is started from an I frame

Fixes Ticket2811
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes seeking to the last frame in CBR files
Fixes Ticket2773
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Fixes Ticket2980
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

also provide a list of workarounds to the user

Fixes Ticket2363
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* qatar/master:
  fft-test: Remove possibility of returning restricted exit code
  dct-test: Remove possibility of returning a restricted exit code
  base64-test: Remove posibility of returning restricted exit codes
  tree-test: Don't return restricted exit codes

Conflicts:
	libavutil/base64.c

See: b2fdf3fc
See: f80ca1cb
See: cbbd0ac7
See: 5dfdffebMerged-by: NMichael Niedermayer <michaelni@gmx.at>

This strips the relative timestamp "flag" off.

Fixes Ticket2849
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: NDerek Buitenhuis <derek.buitenhuis@gmail.com>