* cehoyos/master:
  lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
  lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8692d74b':
  mov: Add option to keep exact packet sequence after seeking

Conflicts:
	libavformat/isom.h
	libavformat/mov.c
	libavformat/version.h

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

This change allows remuxing hevc from mpeg-ts to Matroska.

Fixes ticket #4375.

Reviewed-by: Hendrik Leppkes

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

Commit dfa92080 ("mips/float_dsp: fix a bug in vector_fmul_window_mips")
fixed vector_fmul_window_mips by unrolling the loop only 4 times, but also
removed the outer C loop and replaced it with assembly branches and pointer
arithmetic. When submitting my 64-bit porting patch I missed this new
assembly which also needed porting.

This patch fixes a bus error in the fate-float-dsp test when run on 64-bit
mips.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The current behavior may produce a different sequence of packets
after seeking, compared to demuxing linearly from the beginning.
This is because the MOV demuxer seeks in each stream individually,
based on timestamp, which may set each stream at a slightly different
position than if the file would have been read sequentially.

This makes implementing certain operations, such as segmenting,
quite hard, and slower than need be.

Therefore, add an option which retains the same packet sequence
after seeking, as when a file is demuxed linearly.

The current behavior may produce a different sequence of packets
after seeking, compared to demuxing linearly from the beginning.
This is because the MOV demuxer seeks in each stream individually,
based on timestamp, which may set each stream at a slightly different
position than if the file would have been read sequentially.

This makes implementing certain operations, such as segmenting,
quite hard, and slower than need be.

Therefore, add an option which retains the same packet sequence
after seeking, as when a file is demuxed linearly.

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is a variant of showwaves. It is implemented as a different filter
so that the user is not allowed to use meaningless options which belong
to showwaves (such as rate).

Major edits done by Stefano Sabatini, from a patch by ubitux.

See thread:
From: Clément Bœsch <u@pkh.me>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 24 Dec 2014 15:03:26 +0100
Subject: [FFmpeg-devel] [PATCH] avfilter/showwaves: add single_pic option

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

* commit '58a840e2':
  Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat

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

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

bits can have a value of 0 or 1 they are never -1 or otherwise negative
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '6289706b':
  fate: Move tdsc to the appropriate screen capture file

Conflicts:
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '423f5d50':
  mov: Fix little endian audio detection

Conflicts:
	libavformat/mov.c

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

* commit 'cdce9e80':
  aacsbr: Fix type for index variable

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

* commit '7c60c124':
  hqx: Drop unused offsets table
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4326bc36':
  lavf: Do not list mov-only codecs in riff tags

Conflicts:
	libavformat/Makefile
	libavformat/avidec.c

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

* commit 'cf9861de':
  isom: Add X-Com Radvision FourCC

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

* commit '02d76141':
  riff: Add 'tshd' FourCC for H.264

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

* commit 'c0f504e9':
  libx264: Allow full-range yuv422 and yuv444 pixel formats

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

* commit 'c9ed48e8':
  dca: Read params->pancABIT0[param_index] only if part0 is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '48aef27f':
  x86: Put COPY3_IF_LT under HAVE_6REGS

Conflicts:
	libavcodec/x86/mathops.h

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

Fix crash with for example:
  ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -

* commit '96dd0442':
  isom: Add support for TSCC2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '91894f27':
  configure: Disable shift operator precedence warnings with MSVC

Conflicts:
	configure

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

Fixes demuxer choice for Ticket 2792
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Set this field to TRUE if the audio component is to operate on
little-endian data, and FALSE otherwise.

However TRUE and FALSE are not defined. Since this flag is just a boolean,
interpret all values except for 0 as little endian.

Sample-Id: 64bit_FLOAT_Little_Endian.mov

Prevents unsigned overflow and variable truncation.

Bug-Id: CID 603186

This is a leftover from the static to dynamic vlc table conversion.