Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This fixes G722 durations

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

* qatar/master:
  configure: enable pic for shared libs on AArch64
  zmbv: Reset the decoder on keyframe errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7b8c5b26':
  vc1dec: prevent a crash due missing pred_flag parameter
  matroska: Fix use after free
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ec86ba57':
  vp3: Fix double free in vp3_decode_end()
  fate: Split fate-siff test into demuxer and VB video decoder test

Conflicts:
	tests/fate/demux.mak
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Martin Storsjö <martin@martin.st>

Prevent the crash on fuzzed files as reported in bug 63.

Handle pred_flag parameter not given to get_mvdata_interlaced()
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Fixes state becoming inconsistent
Fixes a null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes potential divisions by zero and out of array accesses.
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

EAGAIN is used internally in the code; it currently does not make
sense as a return code from the next filter.

Should fix CID966655.

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

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

This avoids copying the input
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

THis more closely matches what the field represents
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  rtpdec_vp8: Don't trim too much data from broken frames
  rtpdec_vp8: Simplify code by using an existing helper function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes a crash with a file containing a 400MB packet reported in bug 420.

* commit 'ed790932':
  rtpdec: Add a terminating null byte at the end of the SDES/CNAME
  yuv4mpeg: do not use deprecated functions
  oggdec: fix faulty cleanup prototype
  idcin: return 0 from idcin_read_packet() on success.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5d045046':
  idcin: better error handling
  idcin: check for integer overflow when calling av_get_packet()

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

* commit '7040e479':
  idcin: allow seeking back to the first packet
  idcin: set AV_PKT_FLAG_KEY for video packets with a palette
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ccc0ffb1':
  idcin: set start_time and packet duration instead of manually tracking pts.
  idcin: set channel_layout
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '12c2530b':
  idcin: fix check for presence of an audio stream
  idcin: validate header parameters
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f7bf72a4':
  idcinvideo: correctly set AVFrame defaults
  yadif: Port inline assembly to yasm
  au: remove unnecessary casts
  au: return AVERROR codes instead of -1

Conflicts:
	libavcodec/idcinvideo.c
	libavfilter/x86/yadif_template.c
	libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fd9147f1':
  au: cosmetics: pretty-print and remove pointless comments

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

* commit 'c88d245c':
  au: use ff_raw_write_packet()
  au: set stream start time and packet durations

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

* commit 'af68a2ba':
  au: use %u when printing id and channels since they are unsigned
  au: validate sample rate
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c837b38d':
  au: move skipping of unused data to before parameter validation
  au: do not arbitrarily limit channel count

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

Fix trac ticket #2128.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

We dont use au_read_packet() anymore and block_align is already set.
Thus nothing had to be merged from these.

* commit '2613de88':
  au: do not set pkt->size directly
  au: set block_align and use it in au_read_packet()

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

* commit '9a7b5688':
  au: set bit rate
  au: validate bits-per-sample separately from codec tag
  rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT

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