* commit 'a1e2c47c':
  libxvid: Return meaningful error messages

Conflicts:
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c

See: 2a89afb3 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This keeps the fields consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '18f4fa25':
  aac_adtstoasc_bsf: Check extradata memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fe0f4e56':
  avpacket: Check buffer reference

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

* commit '31dc73e9':
  vorbisdec: Check memory allocations

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

* commit 'ec17782e':
  dvdsubdec: Check memory allocations

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

* commit 'e51f2212':
  swscale: Check memory allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3035d21b':
  nutdec: Check memory allocations

Conflicts:
	libavformat/nutdec.c

See: 55ae13e3
See: 269845dbMerged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'a8765852':
  movenc: Check memory allocations

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

* commit 'da7e31a2':
  rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd89e58f5':
  dct-test: Fix initialization syntax

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

* commit 'bb770168':
  lavf: Document the codec context initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cb70a93c':
  lavc: Document interaction between avcodec_open2() and decoding routines

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

* commit '733f4b05':
  avplay: Check format allocation inside decode_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '266f2411':
  avplay: Check frame allocation inside video_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '81688e68':
  avconv: Check rc_override memory allocation

Conflicts:
	ffmpeg_opt.c

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

* commit '9d3b752f':
  graphparser: Check av_get_token() memory error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5dc47a2b':
  matroskaenc: Validate chapter start and end times

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

* commit 'f8c17197':
  dca: Remove separate header for DCA ExSS

Conflicts:
	libavcodec/dca.h
	libavcodec/dca_exss.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

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

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Bug-Id: CID 1257835

Related to "warning: suggest braces around initialization of subobject".

During remuxing avcodec_copy_context() is discouraged as certain fields
(such as codec_tag) could reflect invalid values between input and
output contextes.

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

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

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

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

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

(or 32k to 256k in 32-bit)