* commit '8f9fe6ae':
  aarch64: NEON fixed/floating point MPADSP apply_window
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f4d5a2cc':
  aarch64: NEON float to s16 audio conversion
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ee2bc597':
  aarch64: NEON float (i)MDCT
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '650c4300':
  aarch64: NEON float FFT
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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>

The matrices are not zigzagged.

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

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

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

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

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

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

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

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

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

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

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

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>

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

* commit 'f9157463':
  lavf: do not use the parser duration for video
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit 'b19a5e51':
  lavc: improve AVCodecContext.delay doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a4ed995c':
  txd: do not set the codec timebase.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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>

These are similar to the existing FF_ALLOCZ_OR_GOTO & FF_ALLOC_OR_GOTO
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

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