* commit 'e2ce1639':
  mpegts: Support running the write_trailer function without an AVIOContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4895aa65':
  libavformat: Allow calling av_write_trailer with a NULL AVIOContext

Conflicts:
	libavformat/mux.c

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

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

av_get_codec_tag_string() uses more that 1 char for unprintable characters.

use av_get_codec_tag_string() in wav_read_header() for printing the
faulty start code from riff header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Make it more readable and display an error message in case an invalid
header is detected (the current version just returns
AVERROR_INVALIDDATA)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

If opening and closing dynamic buffers as AVIOContext, we may
not have any AVIOContext available when wanting to close and
deallocate the muxer. Allow calling write_trailer despite this.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

Fixes use of uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Suggested-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This simplifies identifying from which revision a binary of a lib came from
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>

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Previous version reviewed-by: Giorgio Vazzana <mywing81@gmail.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>

* commit 'cee4490b':
  on2avc: check number of channels

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

* commit 'd423dd72':
  smc: fix the bounds check

Conflicts:
	libavcodec/smc.c

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

* commit '0b39ac6f':
  gifdec: refactor interleave end handling

Conflicts:
	libavcodec/gifdec.c

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

Fixes compilation on Windows.

* commit '17ba719d':
  mmvideo: check frame dimensions

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

* commit '88626e5a':
  jvdec: check frame dimensions

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

* commit '809c3023':
  mjpegdec: check for pixel format changes

Conflicts:
	libavcodec/mjpegdec.c

See: 5c378d6a
See: a2f680c7Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '64f7575f':
  mov: avoid a memleak when multiple stss boxes are present

Conflicts:
	libavformat/mov.c

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

Fixes invalid memory access.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8549
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Fixes invalid writes when there are more blocks in a run than total
remaining blocks.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8548
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Fixes invalid writes with very small image heights.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8547
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>

The frame size must be set by the caller and each dimension must be a
multiple of 2.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8543
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

The frame size must be set by the caller and each dimension must be a
multiple of 8.

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8542
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Fixes possible invalid memory access.

Based on code by Michael Niedermayer <michaelni@gmx.at>

CC: libav-stable@libav.org
Bug-ID: CVE-2014-8541
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

* commit '210461c0':
  imgconvert: check memory allocations and propagate errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '596b5c48':
  wma: check memory allocations and propagate errors

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

* commit '63be97ec':
  lavfi: always check av_expr_parse_and_eval() return value

not merged, this is incorrect
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9e06327e':
  xcbgrab: Move NULL check before pointer dereference

Conflicts:
	libavdevice/xcbgrab.c

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

* commit '5ac06633':
  takdec: check av_samples_get_buffer_size() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '16c7a8a1':
  aacps: invert the order of parameters of ipdopd_reset()

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