Merge commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4'

* commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4':
  aarch64: NEON fixed/floating point MPADSP apply_window

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

Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'

* commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924':
  aarch64: NEON float to s16 audio conversion

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

Merge commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855'

* commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855':
  aarch64: NEON float (i)MDCT

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

Merge commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62'

* commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62':
  aarch64: NEON float FFT

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

avutil: move av_get_time_base_q() after include rational.h

Fix compilation

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

avutil: Add av_get_time_base_q()

This fixes usage of AV_TIME_BASE_Q in C++ applications, which
cannot use compound literals directly in their code.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

fic: Use proper quantization matrix index

The matrices are not zigzagged.

Fixes artefacting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

aarch64: NEON fixed/floating point MPADSP apply_window

30%/25% (fixed/float) faster mp3 decoding on Apple's A7. The floating
point decoder is approximately 7% faster.

Add "const" to avoid compiler warning.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Add missing ';'.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Various small spelling fixes.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

avcodec/dvbsubdec: use av_mallocz_array()

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

avcodec/cook: use av_malloc_array()

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

avcodec/dsddec: use av_malloc_array()

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

aarch64: NEON float to s16 audio conversion

aarch64: NEON float (i)MDCT

Approximately as fast as the ARM NEON version on Apple's A7.

aarch64: NEON float FFT

Approximately as fast as the ARM NEON version on Apple's A7.

avformat/mpegtsenc: make the pes packet length omission optional

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

avformat/mpegtsenc: Changed Video PES packet length to 0.

The rational for this is another issue that plex has exposed.  When it is
conducting a transcode of video to HLS for streaming, my father noticed
artifacts when played on his GoogleTV (NSZ-GT1).  He sent me a test file
and I reproduced it on my device of the same model.  It is important to
note that the artifacts were not present when streaming to VLC or QuickTime
Player.  I copied the command-line that plex used, and conducted all of the
following tests using FFmpeg git.

Transcode to HLS: artifacts on playback
Transcode to TS: playback is fine
Cat HLS segments into a single TS: playback is fine
Segment single TS file to segments: artifacts on playback
Segment single TS file to segments using Apple's HLS segmenter: playback is
fine

At this point I carefully examined the differences between Apple's HLS
segmenter output and FFmpeg's.  Among the considerable differences, I
noticed that the video PES packets always had a 0 length.  So I continued:

Transcode to HLS using FFmpeg with 0 length PES packets: playback is fine.
Segment single TS to segments with 0 length PES packets: playback is fine.

All failures mentioned are only on the GTV since it is the only player on
which I could reproduce artifacts.  I only tested the GTV, VLC, and
QuickTime Player though, so my test case is limited.  I do not know if
other players exhibit this issue.

Since it was useful last time, I have uploaded the test file as
hls_pes_packet_length.m4v along with its associated txt file which contains
the transcode command-line that was used.

Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vc1dsp: fix build without inline asm

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'

* commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31':
  lavf: do not use the parser duration for video

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

Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'

* commit '1ae8198bca749a0cff205196cc83d35b9962849b':
  avconv: always reset packet pts after decoding an audio frame

Conflicts:
ffmpeg.c

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

Merge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9'

* commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9':
  lavc: improve AVCodecContext.delay doxy

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

Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'

* commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091':
  txd: do not set the codec timebase.

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

lavf: do not use the parser duration for video

The parser has no way of knowing video duration, and therefore no video
parsers set it.

avconv: always reset packet pts after decoding an audio frame

Currently, if a decoder sets AVFrame.pts, we'd send the same timestamp
to it twice, which is wrong.

lavc: improve AVCodecContext.delay doxy

txd: do not set the codec timebase.

It is not supposed to be changed from outside of lavc.
Set the stream timebase and average framerate instead.

avformat/avidec: Speed up keyframe detection code

Fixes Ticket3531

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

MAINTAINERS: Add myself as FIC maintainer

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/wma: use av_malloc_array()

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

avfilter/pthread: Use av_mallocz_array()

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

avcodec/libxavs: Use av_mallocz_array()

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

avcodec/cngenc: Use av_malloc_array()

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

avcodec/snow: use FF_ALLOC(Z)_ARRAY_OR_GOTO

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

avutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTO

These are similar to the existing FF_ALLOCZ_OR_GOTO & FF_ALLOC_OR_GOTO

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

Merge commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8'

* commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8':
  mpegvideo: Use the current_picture pts

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

Merge commit '6f243b17c537646b894857d43dfdac65f85ab377'

* commit '6f243b17c537646b894857d43dfdac65f85ab377':
  avcodec/fic: Fix return value check

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

Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'

* commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9':
  avcodec/fic: clear slice_data

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

Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'

* commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575':
  avcodec/fic: fix slice checks

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

mpegvideo: Use the current_picture pts

The picture slot can be recycled by select_input_picture and
only current_picture is populated with the valid pts.

Unbreak timestamps when in cbr mode.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

avcodec/fic: Fix return value check

Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/fic: clear slice_data

Fixes artifacts
Fixes use of freed memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/fic: fix slice checks

fix integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '93e15a323871613fd26f1f1e317029a50b5b24ca'

* commit '93e15a323871613fd26f1f1e317029a50b5b24ca':
  fic: use correct IDCT

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

fic: use correct IDCT

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avfilter/filtfmts: Support dynamically allocated in/outputs

Fixes crash
Fixes Ticket3468

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

avformat: Fix decoder search in find stream info

Fixes Ticket3548

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

avformat/asfenc: dont allow non interleaved packets

The muxer does not support this currently

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

avformat/pmpdec: remove cur_dts timestamp hack

It appears the demuxer works fine without it

Fixes Ticket3534

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

avcodec/x86/vp9lpf: add a comment above a bunch of SWAP.

avcodec/x86/vp9lpf: merge a few movs with other instructions.

lavf/pcm: remove redundant check

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/arm/vc1dsp_init_neon: fix code so it compiles and passes fate-vc1

The original patch  seems to be missing a 16x16 function though

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

vc1dsp: introduce cases for 8x8 and 16x16

This allows further unrolling the DSP implementation where possible.

x86 and ARM DSP modified by simply moving the multiple calls from vc1dec
to the DSP code. Decoding improvements should only occurs because of the
compiler actually able to unroll more.

Decoding time: ~8.80s -> 8.64s (ie around 2%)

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

avcdoec/webp: use av_malloc_array()

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

avcodec/tiff: use av_malloc(z)_array()

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

avcodec/ratecontrol: use av_malloc_array()

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

avcodec/huffman: use av_malloc_array()

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

avcodec/exif: do not follow 0 offsets

Fixes exif decoding failure of 1295328_300.jpg

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/exif/exif_add_metadata: add support for SSHORT & SBYTE

No working testcase, this omission was just spoted when the parser apparently went out of
sync.

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/xv: implement repaint message
  lavd/xv: add window id param
  lavd/xv: keep aspect ratio

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

avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '911fa05b514e1be009e00b79d7004b93717c023b'

* commit '911fa05b514e1be009e00b79d7004b93717c023b':
  mvc: Specify the pixel format for the mv-mvc* tests

Conflicts:
tests/fate/video.mak

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

mvc: Specify the pixel format for the mv-mvc* tests

Also set the RGBA pixel format correctly as the native endian format,
which is what it returns.

This fixes the tests on big endian.

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

Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'

* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352':
  fate: add tests for SGI RLE and MVC1&2 decoders

Conflicts:
tests/fate/video.mak

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

Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'

* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
  Silicon Graphics Movie demuxer

Conflicts:
Changelog
libavformat/mvdec.c
libavformat/version.h

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

Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'

* commit '86a0432688216562926d4aee36118f01be6d5e1b':
  Silicon Graphics Motion Video Compressor 1 & 2 decoder

Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/version.h

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

Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'

* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
  Silicon Graphics RLE 8-bit video decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h

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

Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'

* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
  h264: codec reinit: remove statements without effect

Conflicts:
libavcodec/h264_slice.c

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

Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'

* commit '6ef96292d99302a59f824713fc763f6abd3754df':
  utils: add yvyu422 to avcodec_align_dimensions2

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

Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'

* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
  filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break

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

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
  lavfi: name anonymous structs

Conflicts:
libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c

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

vp9/x86: simplify FILTER_INIT.

In the 2 FILTER_INIT usages, the source is already preloaded so that
extra complexity taken from FILTER_UPDATE is not necessary.

Also add forgotten "mask" argument in FILTER_{INIT,UPDATE} comments.

vp9/x86: clarify mixed splatb.

fate: add tests for SGI RLE and MVC1&2 decoders

Silicon Graphics Movie demuxer

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Silicon Graphics Motion Video Compressor 1 & 2 decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Silicon Graphics RLE 8-bit video decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

h264: codec reinit: remove statements without effect

avctx->coded_{height,width} will always equal h->{height,width} since
init_dimensions() does that explicitly, Size changes are detected by
changes in mb_{height,width} earlier and propagated through the
needs_reinit variable.

utils: add yvyu422 to avcodec_align_dimensions2

filtfmts: remove unused lavf include

lavfi: name anonymous structs

x86/float_dsp: remove duplicated code from vector_dmul_scalar

Use the xm# and ym# aliases as they remain in sync with m# after a SWAP.
No actual changes to the assembly.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix compilation with !HAVE_6REGS.
  Use MANGLE in cavsdsp.c to save two registers using gcc.

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

Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'

* commit '4936ef6492f640e1606c6507f2c4e495164d3974':
  configure: Handle armcc 5.0

Conflicts:
configure

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

configure: Handle armcc 5.0

The first line of the "armcc --vsn" output in one version is
"Product: ARM Compiler 5.04".

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

Fix compilation with !HAVE_6REGS.

Can be tested with:
$ ./configure --cc='cc -m32' --disable-optimizations --enable-pic

Use MANGLE in cavsdsp.c to save two registers using gcc.

Fixes compilation with !HAVE_6REGS.

avformat/mlv: add fate sample

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Magic Lantern Video (MLV) demuxer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ff_id3v2_read: add option to limit ID3 magic number search

Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.

[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/wavdec: enlarge probe_packets for wav

fix issue https://trac.ffmpeg.org/ticket/3550

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

fate: add DTS-ES test

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavd/xv: implement repaint message

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavd/xv: add window id param

Device is able to use existing window, that can be a
part of existing GUI - instead of newly created one.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavd/xv: keep aspect ratio

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

avfilter/vf_rotate: make int*90° rotates suck less speedwise

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

avfilter/vf_rotate: fix several of by 1 errors

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