* commit '73ea3ffc':
  w32pthreads: use the CONDITION_VARIABLE typedef if available

Conflicts:
	compat/w32pthreads.h
	configure

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

This silences warnings about passing arguments from incompatible pointer type
when targeting Windows Vista or newer.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

Idea from: a2c00d22Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

also remove a related dead store
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fixes build failure

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

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

Fix basename computation code to allow just file names without any
directories in the path.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

On init failure, let's just free it, so next time it will be recreated from
start.

Also fixes Coverity CID 1241515.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>

compat/w32pthreads: use the condition variable API directly when targeting newer versions of Windows

Wrap the function calls in a similar fashion to how it's being done
with the critical section API.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

In dahsmode Matroska is not writing the first Cluster for every
audio stream in the Cues element.
Signed-off-by: Frank Galligan <frankgalligan@gmail.com>
Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This silences warnings about passing arguments from incompatible pointer type
when targeting Windows Vista or newer.
Tested-by: Matt Oliver <protogonoi@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@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>

syncframes in E-AC-3 can be combined to provide 6 audio blocks per
sample, thus requiring parsing for proper decoding.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '2bc22095':
  ismindex: handle discontinuous streams better

Conflicts:
	tools/ismindex.c

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

Reads the fragment duration from the trun sample data, rather than
assuming that there are no gaps. Creates much better playlists for our
inputs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Read the fragment duration from the trun sample data, rather than
assuming that there are no gaps.
Signed-off-by: Martin Storsjö <martin@martin.st>

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>

* commit '1a02e786':
  vc1: initialize color properties

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

* commit 'eddf9528':
  vp9: initialize color space and range properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '65875a8b':
  vp8: initialize color space and range properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0d8a3656':
  mov: support the Color Parameter Atoms 'colr'
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '586ea037':
  avcodec: fix colorspace option description
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '91eef402':
  avcodec: add enum values on chroma sample location

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

* commit '9d5fed6d':
  avcodec: fix descriptions on color transfer options
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '167e6f14':
  dump: Update streams and chapters printout format

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

* commit '9f3a70c4':
  dump: print the original coded dimensions when available
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '41e86146':
  dump: print detailed color space information

full color triplets are only printed if they are not all equal, otherwise
they are printed as before
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The default is to maintain the previous ", " for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The default is to maintain the previous ", " for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '20a5956b':
  dump: split audio and video probing on multiple lines

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

* commit '5a419b2d':
  pixdesc: return color properties names

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixdesc.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '04ccd584':
  pixfmt: mark further reserved values

Conflicts:
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c732c62c':
  doc: expand description for some color properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>