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

* qatar/master:
  af_join: do not leak input frames.
  asrc_anullsrc: return EOF, not -1

Conflicts:
	libavfilter/asrc_anullsrc.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'f4281f45':
  asrc_anullsrc: do not set samplerate and channel layout explicitly

Conflicts:
	libavfilter/asrc_anullsrc.c

No change to FFmpeg due to semantic difference between the filter sources
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'e4a7b217':
  vf_showinfo: remove its useless init function
  AVOptions: fix using named constants with child contexts.

Conflicts:
	libavutil/opt.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '9676b9a2':
  AVOption: remove an unused function parameter.
  filters.texi: restore mistakenly removed section name for noformat
  avfiltergraph: use sizeof(var) instead of sizeof(type)
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '42c7c61a':
  avfiltergraph: replace AVFilterGraph.filter_count with nb_filters

Conflicts:
	doc/APIchanges
	libavfilter/avfiltergraph.c
	libavfilter/avfiltergraph.h
	libavfilter/graphparser.c
	libavfilter/version.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '556aab8f':
  lavfi: use designated initializers in avfilter_class

Conflicts:
	libavfilter/avfilter.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'aa3c7799':
  lavf: sanity check size in av_get/append_packet().

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

* commit 'ca6c3f2c':
  lzo: fix overflow checking in copy_backptr()
  flacdec: simplify bounds checking in flac_probe()
  atrac3: avoid oversized shifting in decode_bytes()

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

This is admittedly kind of pointless since usually -f image2pipe
can be used for the purpose, but this is more user-friendly.
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

Otherwise ffmpeg -formats claims that we only support demuxing
of that format.
To keep compatibility the struct could be duplicated instead,
but this seems almost like overkill for such a rare format.
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

- Make MultiByteToWideChar fail when it encounters invalid encoding.
  Without this, invalid characters might just be skipped
- When MultiByteToWideChar fails, assume the file name is in CP_ACP
  and open it via normal open function, even when the file will be
  written
- When malloc fails return error instead of crashing
Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: NReimar Döffinger <Reimar.Doeffinger@gmx.de>

They are auto-negotiated.

Filter private data is memset to 0 so there is no point in explicitly
initing anything to 0.

The named constant needs to be searched for in the same object on which
the option is set, i.e. target_obj.

This is more consistent with the naming in the rest of Libav.

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

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

Fix a memory leak because the compat implementation of
AV_BUFFERSINK_FLAG_PEEK is not identical to the previous one.

To avoid allocating ridiculous amounts of memory for corrupted files,
read the input in chunks limited to filesize or an arbitrary large
amount when that is not known (chosen to be 50M).

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

The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Found-by: wm4
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Found-by: wm4
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* qatar/master:
  add support for Monkey's Audio versions from 3.93
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '9652d4fc':
  ape: provide two additional bytes in buffer for old MAC versions
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'b164d66e':
  ape: make version-dependent decoding functions called via pointers
  mpegts: add support for stream_type 0x42, which is CAVS
Merged-by: NMichael Niedermayer <michaelni@gmx.at>