* commit '7f296441':
  aac: Fix low delay windowing.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '42d1b419':
  fate: Add a test vector for AAC ELD with TNS.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b2212dec':
  aac: Fix TNS decoding for the 512 sample window family.

also temporarily disable fate-aac-er_ad6000np_44_ep0 as this commit
causes a mismatch with the reference pcm file
The test will be reenabled after all fixes and with a new pcm reference
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e2096e2e':
  fate: Add a downsampled SBR testvector
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Change "read" to "write" in introductory description.
Spotted-by: Alexander Strasser <eclipse7@gmx.net>

Also drop confusing ff* tools reference about exceptions to the
file:FILENAME syntax, which is not ff* tool specific.

With various edits by Alexander Strasser <eclipse7@gmx.net>.

AAC LD uses a low overlap sine window instead of a KBD window.

Handle the URL analog to file_open, it may contain a "file:"
prefix. Skip it. Make access checks to file URLs starting
with "file:" work.

Fix part of ticket #3249.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

Fix timestamp calculation for code 3 Ogg Opus packets with less than
2 bytes in the last segment (e.g. packet length 255 or 256).
A sample that would seek incorrectly in ffplay can be created with:
  ffmpeg -i in.wav -b:a 34k -vbr off -frame_duration 60 out.opus
and libopus 1.1

Also do not read past the end of the buffer when a packet has length 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some muxers store invalid timestamps there, which breaks seeking
Fixes Ticket2739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This only updates the case where there is no B frame reordering delay.
Tested-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

* qatar/master:
  arm: Use the matching endfunc macro instead of the assembler directive directly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2ad4ee34':
  arm: Add a missing endfunc macro call
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

According to http://doc.iridas.com/index.php?title=LUT_Formats

    for 3D textures, the data is also RGB, and ordered in such a way
    that the red coordinate changes fastest, then the green coordinate,
    and finally, the blue coordinate changes slowest:

Fixes Ticket #3236.

Its usefull to know immediatly if extradata is wrong and not just when later
the decoder tries to use it.

This check was removed by: a6a2282cSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

* qatar/master:
  mpegvideo: remove disabled bfin asm

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

* commit 'a4d0c6e0':
  mpegvideo: move dct_unquantize functions up to avoid forward declarations

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

* commit 'aec25b1c':
  mpegvideo: split the encoding-only parts of frame_start() into a separate function

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

* commit 'b318106f':
  FATE: add a test for the lavr mixing case fixed in fc6a3ef4Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a8cc88b1':
  tests/Makefile: allow FILTER* to be called with lists of filter names
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cc976a75':
  audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fc6a3ef4':
  audio_mix: fix zeroing output channels in certain cases
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3d95d273':
  audio_mix: initialize the data pointers to NULL
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '58312b24':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e89aa4bf':
  lzw: switch to bytestream2

Conflicts:
	libavcodec/lzw.c

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

* commit '1b5d065c':
  pmpdec: check that there is at least one audio packet.

Conflicts:
	libavformat/pmpdec.c

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