* commit '67e285ce':
  mem: Handle av_reallocp(..., 0) properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Mention that the fps filter should be used after pullup.

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

The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data.
(e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32).
Signed-off-by: Neil Birkbeck <neil.birkbeck@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>

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

Previously this did a double free (and returned an error).

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

* qatar/master:
  h264: remove an unused static constant

Merge only for metadata as the constant us not unused in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '33b88f2a':
  msvc/icl: Use __declspec(noinline)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '09f2581d':
  msvc/icl: Use __declspec(deprecated)

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5532ee6d':
  rtmp: Unbreak get_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a9d50bb5':
  dcadec: Validate the lfe parameter

Conflicts:
	libavcodec/dcadec.c

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

* commit 'b97b1adb':
  rtmpproto: Add a comment explaining the logic in handle_notify
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e5d45e02':
  build: Support cparser
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd8798276':
  r3d: Add more input value validation

Conflicts:
	libavformat/r3d.c

See: 99b1b2b1
See: df92ac18Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3ca14aa5':
  rl2: Avoid a division by zero

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

* commit '83c285f8':
  wtv: Add more sanity checks for a length read from the file

Conflicts:
	libavformat/wtv.c

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

* commit 'd8b68660':
  yop: Clear all references to the AVBuffer in the local AVPacket

Conflicts:
	libavformat/yop.c

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

* commit '3185a802':
  fraps: Make the input buffer size checks more strict

Conflicts:
	libavcodec/fraps.c

The added checks are mostly to handle duplicate frames, which
we discard, thus there are also no P frames for example.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '82e266c6':
  segafilm: Validate the number of audio channels

Merge only for metadata as the change is incorrect, checking audio
parameters in video only files

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

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

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

Prior to this on msvc/icl there was no handling of deprecated functions
and the deprecated warning was disabled.

After enabling there are a number of warnings relating to the CRT and
the use of the non-secure versions of several functions.  Defining
_CRT_SECURE_NO_WARNINGS silences these warnings.
Signed-off-by: Martin Storsjö <martin@martin.st>

Commit 5626f994 broke it.

* commit '601c2015':
  svq3: Avoid a division by zero

Conflicts:
	libavcodec/svq3.c

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

* commit '7a5a5572':
  qpeg: Add checks for running out of rows in qpeg_decode_inter

Conflicts:
	libavcodec/qpeg.c

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

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'e9d61de9':
  mpegaudiodec: Validate that the number of channels fits at the given offset

Conflicts:
	libavcodec/mpegaudiodec.c

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

extradata is not mandatory to decode asv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f5080335':
  asvdec: Verify the amount of extradata

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

* commit '72fe16a1':
  movenc: Use null buffers for measuring the amount of data to be written

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

* commit '3627ce2f':
  aviobuf: Add functions for null buffers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bb461370':
  asfenc: mux chapters in ASF files using an ASF "marker" section

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

* commit '09f3c937':
  asfenc: remember send time and offset of the index entries

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

* commit '1eb93280':
  asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c53b5dda':
  asfdec: replace magic constant with DATA_HEADER_SIZE
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5f408333':
  asfdec: substract preroll time from marker presentation time
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This explains why the cleanup in 5626f994 was wrong and why
ae0f316a was needed.
Signed-off-by: Martin Storsjö <martin@martin.st>