* commit 'c4aa0f86':
  libavformat: Remove a misleading/incorrect comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f4d4e66a':
  configure: Remap -L to -libpath for msvc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3e160652':
  cmdutils: update copyright year to 2015.

Conflicts:
	cmdutils.c

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

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

Fixes part of ticket 4221
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is needed for probing some dvbsub streams in mpegts

Fixes part of ticket4221
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is similar to the corresponding audio and video macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is similar to the raw video read header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Fixes out of array reads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This comment can be traced back to the initial commit from 2001,
and it seemed to be misleading/incorect already back then. (It
was used for normal, non-raw file formats already then.)
Signed-off-by: Martin Storsjö <martin@martin.st>

This allows using libraries that are detected via pkg-config with
msvc. (The libraries themselves may have to be built with MSVC
though.)
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.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>

The tests which use encoders which either use slices or store the encoder thread count
keep a hardcoded value of 1

This will help test more threading code like in filters

Found-by: ubitux
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f2ad1495':
  avisynth: Use RTLD_LOCAL instead of RTLD_GLOBAL
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket #4139

* commit '470c9db1':
  sidxindex: Remove parsing that isn't necessary any longer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Happy new year!

* commit '5cf6bda6':
  sidxindex: Don't adjust the Period start time depending on the track start time
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7a1a63e3':
  dashenc: Use pts for MPD timeline timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c5e7ea13':
  dashenc: Use delay_moov
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b3b0b35d':
  movenc: Get rid of a hack for updating the dvc1 atom
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '847bf598':
  movenc: Add an option for delaying writing the moov with empty_moov

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

Also print both if they differ
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c725faeb':
  movenc: Use start_dts/cts instead of cluster[0] for writing edit lists

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

There shouldn't be any need to add the loaded libraries to the global
symbol namespace.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '724cbea7':
  movenc: Remove an unnecessary condition when flushing fragments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '355d01a1':
  movenc: Factorize writing ftyp and other identification tags to a separate function

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

When we don't adjust the Period start time, we don't need to
parse the earliest_presentation_time from the sidx boxes either.
Signed-off-by: Martin Storsjö <martin@martin.st>

This was only necessary to get playback to start with dash.js 1.2.0,
it has been fixed in the git version.

The previous behaviour was incorrect - the Period's start time
is irrespective of the actual first timestamp of the contents
within the period. The Period start time only says when, within the
global timeline, this particular piece should start to be played
back.
Signed-off-by: Martin Storsjö <martin@martin.st>