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>

* commit '6d96c7ea':
  vf_showinfo: Forward the av_image_get_linesize error

Conflicts:
	libavfilter/vf_showinfo.c

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

* commit 'f4017925':
  vf_drawtext: Do not leak the mmapped textfile

Conflicts:
	libavfilter/vf_drawtext.c

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

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

This fixes the ratecontrol code with snow
adding FF_MPV_COMMON_OPTS is needed as the generic rate control options
are currently in the (unrelated) MpegEncContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '530c1441':
  lavc: make lmax/lmin into private options of mpegvideo encoders

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

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

Prevent possible memory leaks.

Connect to nginx and request a non-existent resource to
trigger the issue.

CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Uwe L. Korn <uwelk@xhochy.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Casting the left-most byte to unsigned avoids an undefined
result of the shift by 24 if bit 7 is set.

yuvPlanartouyvy_c and yuvPlanartoyuy2_c are affected.

CC: libav-stable@libav.org
Bug-Id: CID 732281 / CID 732282

Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is
available.

CC: libav-stable@libav.org
Bug-Id: CID 1238992
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

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

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

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

And validate its size while at it.

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

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

* commit '15ec053c':
  lavc: make border_masking into private options of mpegvideo encoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c4f7bee0':
  lavc: deprecate unused mb_threshold field

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

* commit '685be3d1':
  libvpxenc: add static-thresh private option

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

* commit '59b55c49':
  lavc: deprecate unused me_threshold field

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

* commit '66a68ddd':
  lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a75c2eb2':
  lavc: make rc_eq into private options of mpegvideo encoders

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