* commit 'bd737b51':
  h264: reset the private data in init_thread_copy()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a939e5b2':
  h264: remove a commented out nonsense line
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This is needed for svq3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '65afa65e':
  h264: drop redundant initialization of the scaling matrices
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e1f90771':
  h264: factor out common code from init() and init_thread_copy()

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

This is needed for the svq3 code to work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '43fd3dd8':
  h264: drop redundant initialization in init()

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

* commit '050324d0':
  h264: initialize cur_chroma_format_idc

See: a51fbb56 / 137df692Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '84f226a3':
  h264: use the correct SPS during PPS parsing

Conflicts:
	libavcodec/h264_ps.c

See: dc35b77bMerged-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>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The generic code copies the main context's private data to all the
others. However that is quite dangerous, as it might end up copying some
pointers that are or will become invalid.

Since everything we actually need will be copied later in
update_thread_context(), it's safest to zero the private data in
init_thread_copy(), so it works the same way as init for the main
context.

It will always be initialized when actually parsing the PPS.

There is no real advantage to initializing any of those in init,
assuming yuv420, before the real stream parameters are known.

This makes sure the various DSP contexts get properly initialized in
ff_h264_set_parameter_from_sps() whatever the value of
raw_bits_per_sample.

There is in general no reason for the currently active SPS to be the one
referenced by the PPS being parsed.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Reviewed-By: Nicolas George <george@nsup.org>

Fixes Ticket #2913
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This patch adds support for creating DASH manifests for WebM Live
Streams. It also updates the documentation and adds a fate test to
verify the behavior of the new muxer flag.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa1a1b24':
  avconv: Avoid theoretical NULL dereferences

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

This patch adds support for parsing live files (produced by
-f webm_chunk) which contains only the headers but no packets. This
is only used when using -f webm_dash_manifest. There will be a
follow up patch which adds live support to WebM DASH Manifest
muxer.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  lavf/mov: Do not overread iTunes metadata.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Bug-Id: CID 1292519
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

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

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

Fixes deadlock
Fixes Ticket4428
Fixes Ticket4429
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #4425.

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

This is more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes CID 1257827.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Generally, libavformat exports cover art pictures as video streams with
1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
it as attachment with codec_id set to AV_CODEC_ID_MJPEG.

Obviously, this should be consistent, so change the Matroska demuxer to
export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.

Matroska muxing is probably incorrect too. I know that it can create
broken files with an audio track and just 1 video frame when e.g.
remuxing mp3 with APIC to mkv. But for now this commit does not change
anything about muxing, and also continues to write attachments with
AV_CODEC_ID_MJPEG should the muxer application have special knowledge
that the Matroska is broken in this way.

Fixes trac #4423.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* cehoyos/master:
  Fix codec fps diplay for very small fps.
  lavf/mpeg: Support alaw in Hikvision CCTV recordings.
  lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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