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

CC: libav-stable@libav.org

And break flow of execution rather than exiting the function.

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

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

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

And make sure the nb_side_data field is reset as well.

Based on an initial patch from wm4 <nfxjfg@googlemail.com>.

CC: libav-stable@libav.org

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

Additional improvements and fixes by Michael Niedermayer <michaelni@gmx.at>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

The pts and the corresponding duration is written in sidx
atoms, thus make sure these match up correctly.
Signed-off-by: Martin Storsjö <martin@martin.st>

Since this structurally is quite different from normal RTP
(multiple streams are muxed into one single mpegts stream,
which is packetized into one single RTP session), it is kept
as a separate muxer.

Since this structurally also behaves differently than normal
RTP, all of the other muxers that do chained RTP muxing
(rtsp, sap, mp4) would need to be updated similarly to handle
this - in particular, creating one single rtp_mpegts muxer
for the whole presentation instead of one rtp muxer per stream.
Signed-off-by: Martin Storsjö <martin@martin.st>

The packetizer only supports splitting at GOB headers - if
such aren't available frequently enough, it splits at any
random byte offset (not at a macroblock boundary either, which
would be allowed by the spec) and sends a payload header pretend
that it starts with a GOB header.

As long as a receiver doesn't try to handle such cases cleverly
but just drops broken frames, this shouldn't matter too much
in practice.
Signed-off-by: Martin Storsjö <martin@martin.st>