Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: remove disabled bfin asm

Conflicts:
	libavcodec/bfin/mpegvideo_bfin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/rv10: cleanup rpr handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/rv30: cleanup rpr handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/rv30: check rpr before use against maximum

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/rv30: put the rpr check back in init with the max vs bits bug fixed

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: a6a2282c25abe43e352010a7c3fbc92994c0bc1c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/lut3d: fix channel order in Iridas format parsing.

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.
arm: Add a missing endfunc macro call

Signed-off-by: Martin Storsjö <martin@martin.st>
arm: Use the matching endfunc macro instead of the assembler directive directly

Signed-off-by: Martin Storsjö <martin@martin.st>
Merge commit '2ad4ee345a4216aef3999f57dd14c56128d27a13'

* commit '2ad4ee345a4216aef3999f57dd14c56128d27a13':
  arm: Add a missing endfunc macro call

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

* qatar/master:
  arm: Use the matching endfunc macro instead of the assembler directive directly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/nut: add support for per frame side & meta data with version 4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Changelog: add nuts side & metadata support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avutil/mathematics: add av_add_stable()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avutil/rational: av_add_stable() test code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/utils: fix rounding error accumulation for generated dts in compute_pkt_fields()

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>
avformat/oggdec: dont read timestamps from EOS pages of ogm videos

Some muxers store invalid timestamps there, which breaks seeking
Fixes Ticket2739

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/oggparseopus: fix segmented timestamps

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>
lavf/file: file_check: Handle file URLs that start with "file:"

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>
fate: Add a downsampled SBR testvector
aac: Fix TNS decoding for the 512 sample window family.