* commit 'bf4b0ed1':
  Add missing deprecation attributes

Conflicts:
	libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5b097399':
  eval: Explicitly ignore return value of strtod() in parse_db()

Conflicts:
	libavutil/eval.c

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

* commit '6ff15cd5':
  Remove unreachable returns
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c8f0b20b':
  avidec: Let the inner dv demuxer take care of discarding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '10aa44aa':
  avidec: K&R formatting cosmetics

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

* commit '37063714':
  build: Only check FATE dependencies when running FATE tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '16c22122':
  h264: K&R formatting cosmetics

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

* commit '96668944':
  buffersink: K&R formatting cosmetics

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

Some decoders may output both, this way the decoder can set it.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

Reported and tested by Dave Rice.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

The return value is not needed.  This fixes the warning:
libavutil/eval.c:353:15: warning: ignoring return value of ‘strtod’

CC: libav-stable@libav.org

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Only check dependencies if invoking the make targets 'check'
or anything matching 'fate%' except 'fate-rsync'.
Signed-off-by: Martin Storsjö <martin@martin.st>

speed relevant ones use av_assert2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

Also check return value.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

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

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

* qatar/master:
  wtv: Drop some casts that now are unnecessary

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

* commit '86f042dc':
  wtv: Make WTV_SECTOR_BITS a 64 bit constant

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

* commit '80ade798':
  AIX: add support for shared builds
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b5123601':
  avio: Don't set the seekable flag if no seek function is provided

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

* commit '1297f7b8':
  rtpenc: Fix some odd comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '779e6c2b':
  lavfi: add attribute_align_arg to all public entry points

Conflicts:
	libavfilter/buffersink.c

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