* 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 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>

* commit '76ccf114':
  rtsp: check ffurl_get_file_handle() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b1306823':
  check memory errors from av_strdup()

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

* commit '9745f19f':
  assdec: check the right variable

Conflicts:
	libavcodec/assdec.c

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

* commit '971099ff':
  aacenc: correctly check returned value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ac467d94':
  lcl: return an appropriate error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8b263331':
  mpegts: check get16() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '430a8168':
  oggdec: add support for VP8 demuxing

Conflicts:
	Changelog
	libavformat/oggparsevp8.c
	libavformat/version.h

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

* commit '38129c26':
  cmdutils: check file access functions return values

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

* commit 'c63dd3f0':
  a64multi: check elbg return values

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

* commit '3beb9cba':
  roqvideo: check memory allocations and propagate errors

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

* commit 'ae2d41ec':
  elbg: check memory allocations and propagate errors

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

* commit '5d839778':
  lavu: Refactor side data wiping

Conflicts:
	libavutil/frame.c

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

* commit 'effa7d2a':
  fate: add test for offset theora
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '67fc8a15':
  theora: support different visible and coded frame size

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

* commit 'a381e0ce':
  fate: add a DPX parser test
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '87bd298a':
  DPX parser

Conflicts:
	libavcodec/dpx_parser.c
	libavcodec/version.h

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

* commit '3a3790b8':
  tiff: support encoding and decoding 64bit images

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/version.h

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

* commit '59f0275d':
  movenc: Adjust the pts of new fragments similarly to what is done for dts
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8a70ef94':
  libavformat: Add a muxer wrapping mpegts encoding into RTP

Conflicts:
	Changelog
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a505c0d7':
  rtp: Initial H.261 support

Conflicts:
	Changelog
	libavformat/rtpdec_h261.c
	libavformat/rtpenc_h261.c
	libavformat/sdp.c
	libavformat/version.h

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

* commit 'adc214e6':
  rtpenc: Avoid brittle switch fallthroughs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3bb46524':
  h261dec: Fix context initialization sequence

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

Also adds a lot of infrastructure necessary for it.
Some of it is a bit ugly though.
Increases binary size for hardcoded tables by about 12 kB,
which is about 15 kB from qdm2_table minus data and code
saved that was only used for creating it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

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

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

Bug-Id: CID 1254668

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

This is the order that the caller uses in the rest of the file. The
same operation is applied to both parameters, so this change is only
done for consistency, it doesn't change the actual behaviour.

Bug-Id: CID 732285 / CID 732286