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

This fixes a bogus bitrate value in the header of WAV files with
alaw/ulaw audio.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 7d7b40f4

)

Conflicts:

	libavcodec/pcm.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b5d7b80a

':
  ffv1dec: check that global parameters do not change in version 0/1

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

* commit '452e3432

':
  avcodec: Add more missing #includes for ff_get_buffer()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5a2d1913

':
  Prepare for 0.8.15 Release

Conflicts:
	RELEASE

Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'e24d1cbc

':
  lavf: Fix leftovers from the ff_get_buffer patch
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c98d164a

':
  configure: Check for -Werror parameters on clang

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

* commit '0ab76ddf':
  avcodec: Introduce ff_get_buffer

Conflicts:
	libavcodec/8svx.c
	libavcodec/dpcm.c
	libavcodec/utils.c
	libavcodec/vmdav.c
	libavcodec/yop.c

See: 668494ac

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

* commit '042c25f5

':
  Update Changelog for v0.8.14

Conflicts:
	Changelog

Not merged as the Changelog isnt correct for FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'dcc68de9':
  vp3: Copy all 3 frames for thread updates

See: 247d30a7

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

* commit 'ebe2292e':
  mpegts: Do not try to write a PMT larger than SECTION_SIZE

Conflicts:
	libavformat/mpegtsenc.c

See: 68b14c04

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

* commit 'd86df7dd

':
  mpegts: Define the section length with a constant
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a79e58cd

':
  Update Changelog for v0.8.14
  Prepare for 0.8.14 Release

Conflicts:
	Changelog
	RELEASE

No change as this does not apply to FFmpeg 1:1
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c79cf012

':
  error_concealment: avoid using the picture if not fully setup
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Add padding, clear size, use the correct pointer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4213fc5b

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

* commit '9d5f4f02

':
  svq1: do not modify the input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cf6b2a0a

':
  cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3aebdffb

':
  cdgraphics: switch to bytestream2

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

Such changes are neither allowed nor supported

Found-by: ami_stuff
Bug-Id: CVE-2013-7020
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit da7d839a

)
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Conflicts:
	libavcodec/ffv1dec.c

* commit 'a1804df6

':
  huffyuvdec: check width size for yuv422p
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e17dc0a2

':
  mmvideo: check horizontal coordinate too
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4a662255

':
  huffyuv: Check and propagate function return values

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

* commit '50493f1f

':
  twinvq: fix out of bounds array access
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3e60501f

':
  h264: slice-mt: check master context for valid current_picture_ptr
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7585a625

':
  h264: prevent theoretical infinite loop in SEI parsing

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

* commit '184c7972

':
  h264_sei: check SEI size

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

* commit 'a465ed57

':
  pgssubdec: Check RLE size before copying
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '976f2e0a

':
  x86: Fix linking with some or all of yasm, mmx, optimizations disabled

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

* commit '28f2d3c5

':
  cmdutils: Conditionally compile libswscale-related bits

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

* commit '277103e0

':
  video4linux2: Avoid a floating point exception

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

* commit 'e4fdfdf6

':
  vf_select: Drop a debug av_log with an unchecked double to enum conversion
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '187cfd3c

':
  eamad: use the bytestream2 API instead of AV_RL

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

The automated script did not perfectly replace all the instances nor
added internal.h in all the files requiring it.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 9eded0fe

)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Validate the image size there as is done in the other release
branches.

Bug-Id: CVE-2011-3935
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Fixes a double release of the current frame on deinit.

Bug-Id: CVE-2011-3934
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>