Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'

* commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92':
  fate: aac: Add test for AAC-LD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Increase the tolerance in the lavr tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/hevcpred: fix make checkheaders.
avformat/flvdec: use avpriv_request_sample()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
wtv: Seek by sector properly

Use an helper function to seek by sector to avoid possible mistakes
due shifting by WTV_SECTOR_BITS a 32bit integer.

Contrary to common intuition, a 32 bit integer left shifted
by a 64 bit integer does not promote the 32 bit integer to
64 bit before shifting.
Support 4k AVC-Intra in mov.
avcodec: Add little-endian G726 decoder

Fixes part of Ticket1955
suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat: Use G726LE decoder for Sun AU files

fixes ticket #1955 as suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavf/riff: Fix a comment.

FourCC aivx refers to (Sony) XAVC, not (Panasonic) AVC-Intra.
Spotted by Kieran Kunhya and Vincent Olivier.
Fix decoding of G.726 in AIFF.

Fixes ticket #1973.
MAINTAINERS: add my name to a few entries
lavd/fbdev: pass proper memory map length

fbdev->data was allocated with size fbdev->fixinfo.smem_len, release data
in fbdev_read_close() using the same size.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
lavd/pulse_audio_dec: apply cosmetic changes

In particular, fix punctuation in docs and make option help messages
grammatically consistent.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
lavd/fbdev: use av_str2err() macro for printing error messages

In particular fix wrong strerror(ret) with a negative value, and avoid
the use of non thread-safe strerror().
lavd/pulse_audio_enc: fix error check

Error check should be done by checking negative value, not non-zero.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
configure: remove \r from cc_ident,

This should fix cygwin + non-cygwin toolchain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
MAINTAINERS: add Timothy to documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/wtv: rename to wtv_common

This helps git matchup files on merges correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Seek by sector properly

Conflicts:
	libavformat/wtvdec.c

See: a0d13d84a928110b0e99ea16d17fd758fcbde35f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/wtvdec: drop SHIFT_SECTOR_BITS() macro

it just wraps around a bitwise shift, and makes the code harder to read

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