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

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

* origin/master:
  libavfilter/vf_blend: do not unconditionally compile both filters
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

The code blindly trusted buffer offsets read from the file in the RLE
decoder. Explicitly check the offset. Also error out on other RLE
decoding errors.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg looks for both .ffpreset and .avpreset files depending on whether the
-[avsf]pre or -pre option is used. Added two sections for each type of preset
including the rules according to which files are searched.

(Notably, the lookup order is swapped for avpreset files, because it first
looks for <codec>_<arg>.avpreset and then for <arg>.avpreset.)

This removes the section explaining -pre only, which was under "Examples",
where it did not really make sense.
Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '46808fdf':
  movenc: Enable editlists by default if delay_moov is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9f810a9b':
  libavformat: Check for malloc failures in avformat_new_stream

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

* 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>

Being able to write editlists properly is one of the main points
in the delay_moov flag.
Signed-off-by: Martin Storsjö <martin@martin.st>

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

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>