Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0

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

* qatar/master:
  h263dsp: K&R formatting cosmetics
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '0338c396':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
	configure
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

Also remove array element numbering comments.

Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  Remove #undefs for formerly forbidden system functions
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

* commit 'cffecc0e':
  avfilter/graphparser: Directly free filter memory if initialization fails

Conflicts:
	libavfilter/graphparser.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Reviewed-by: NWei Gao <highgod0401@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NDave Yeo <daveryeo@telus.net>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Fixes Ticket #2936.

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Signed-off-by: NPaul B Mahol <onemda@gmail.com>

Fixes probetest failure
Reviewed-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

See: https://trac.ffmpeg.org/ticket/3024

The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.

Fixes accumulation of data in case of significant silence injections
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

* cus/stable:
  ffplay: add smarter method for determining video picture duration
  ffplay: add frame duration estimated from frame rate to VideoPicture
  ffplay: avoid code duplication in AVFILTER enabled and disabled case
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  configure: Move -Wno-maybe-uninitialized check into gcc section
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

- consider it an invalid PTS when the next PTS value is the same as the current one
- in case of invalid or unknown PTS, return vp->duration

This fixes ffplay part of ticket #3005.
Signed-off-by: NMarton Balint <cus@passwd.hu>

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