Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

* commit '7b48bf95':
  wtv: clean memory on error

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

* commit '9fbc613f':
  wtv: check seek_by_sector return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd7f530b0':
  aviobuf: check context before using it

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

* commit '02484d1a':
  avio: fix sizeof argument

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

* commit '8ab3b71e':
  idcin: fix return check

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

configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabled and in LE environment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Make use of the V4L2 VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

CC: libav-stable@libav.org
Bug-Id: CID 718002

CC: libav-stable@libav.org
Bug-Id: CID 1198258

Avoid a possible null pointer dereference.

CC: libav-stable@libav.org
Bug-Id: CID 1135769

CC: libav-stable@libav.org
Bug-Id: CID 732284

CC: libav-stable@libav.org
Bug-Id: CID 732198

Fixes fate-cast5 on alpha
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

int ff_http_averror(int status_code, int default_averror)

This helper function returns AVERROR_ value from 3-digit HTTP status
code.

Second argument, default_averror, is used if no specific AVERROR_ is
available. It is introduced because in different places of code
different return codes are used - -1, AVERROR(EIO), AVERROR_INVALIDDATA.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Idea from: a2c00d22Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

For URLs "rtmp://server[:port]/foo" determine what `foo` refers to. If
application name has been defined by the user assume that `foo` is a
playpath, otherwise assume application name.
Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavfi: added option to vf_perspective to specify transformation by giving destinations of corners of source.
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.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>

The colon after the localtime function call needs an additional layer of
escaping or else everything until the next colon is treated as a
fontfile.
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows restricting demuxers to a list of needed ones for improved security
Note, some demuxers themselfs open other demuxers, these are only restricted if
AVOptions are forwarded to them. Please check that your code does that.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows restricting decoders to a list of needed ones for improved security
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is similar to 20a5956b

The difference this change makes affects only rather few files
but looks like:
Stream #0:1: Video: mjpeg, 90k tbr, 90k tbn, 90k tbc
vs.
Stream #0:1: Video: mjpeg, none(bt470bg/unknown/unknown), 90k tbr, 90k tbn, 90k tbc
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 '0034314a':
  rtmp: Always call rtmp_close() on rtmp_open() failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fc1eda54':
  swscale: fix sign extensions in yuv planar conversion

Conflicts:
	libswscale/rgb2rgb_template.c

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

* commit 'b7c77912':
  oss_audio: use a macro to simplify ioctl() error checking

Conflicts:
	libavdevice/oss_audio.c

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

* commit '963f7614':
  avresample: Make sure the even check does not overflow
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '088eca28':
  avresample: prevent theoretical division by zero
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0d989dbf':
  af_resample: check av_opt_set_dict return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>