* commit '55b59fab':
  roqaudio: Always use the frame buffer on flush

Conflicts:
	libavcodec/roqaudioenc.c

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

* commit '0562887a':
  tiffenc: initialize return value

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

* commit '299d8ab1':
  cook: Make sure there is enough extradata

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

* commit '30b8eb0f':
  sol: simplify sol_codec_id()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b99ca863':
  aacdec: avoid an out-of-bounds write

Conflicts:
	libavcodec/aacdec.c

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

* commit '277ff7f5':
  lavu: move internal define to the only places where it is used

Conflicts:
	libavcodec/h264_cabac.c
	libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '065923b0':
  mpegenc: prevent a NULL pointer dereference

Not merged, this is not needed, and could hide more serious issues
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9c12c6ff':
  motion_est: convert stride to ptrdiff_t

Conflicts:
	libavcodec/me_cmp.c
	libavcodec/ppc/me_cmp.c
	libavcodec/x86/me_cmp_init.c

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

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

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

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

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

Prevent NULL dereference.

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

'ret' can only be used without initialization if s->height <= 0, which can
only happen if avctx->height <= 0, which is validated elsewhere. Doesn't hurt
to still initialize it though.

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

At least 8 bytes are needed (Mono audio).

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

Bug-Id: CID 1238993

Also move the check in the case it is actually used.

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

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

CC: libav-stable@libav.org
Bug-Id: CID 700556 / CID 700557 / CID 700558

version is 54 already
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

In current versions of ffmpeg, when streaming to an RTMP server, anytime a packet of type
RTMP_PT_NOTIFY is encountered, the packet is prepended with @setDataFrame before it gets sent
to the server. This is incorrect; only packets for onMetaData and |RtmpSampleAccess should
invoke @setDataFrame on the RTMP server. Specifically, the current bug manifests
itself when trying to stream onTextData or onCuePoint invocations.

This fix addresses that problem and ensures that the @setDataFrame is only prepended
for onMetaData and |RtmpSampleAccess.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also replaced return -1 with return AVERROR(EINVAL)
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

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

Also use length and not stream position
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: James Almer <jamrial@gmail.com>

Fixes ticket #4132.

Inspired from a patch by Michal Wazgird <mplayer@cyryl.net>

See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html

Inspired by a patch from Michal Wazgird <mplayer@cyryl.net>

See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html

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

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

Also add a FATE test.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

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

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

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

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

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

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

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