* commit 'ecf442a5':
  lavf: improve support for AVC-Intra files.

Conflicts:
	libavformat/internal.h
	libavformat/isom.c
	libavformat/mxfdec.c
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '951d8190':
  mxfdec: update current edit unit when seeking in mxf files without index tables

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

Generate extradata with SPS/PPS based on container dimensions.

Authors of this commit are: Reimar and Thomas Mundt
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Fixes audio packet pts values in some files generated by AVID TRMG 3.01.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

* qatar/master:
  mpeg12dec: Remove outdated UV swapping code for VCR2

Not merged as this change would likely break VCR2 with XVMC
The code can be removed when / in case XVMC is removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '669fe505':
  twinvq: consume block_align+1 packets as full ones

Conflicts:
	libavcodec/twinvq.c

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

* commit '1afa8a75':
  twinvq: support multiple frames per packet

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

* commit 'ddb839e9':
  metasound: add missing modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7b9780e7':
  mpeg12dec: Remove unused swap_uv member from Mpeg1Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cce3e0a4':
  Move av_fast_{m,re}alloc from lavc to lavu.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavutil/mem.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'aa241229':
  lavc: deprecate FF_MAX_B_FRAMES

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

* commit 'b6094811':
  lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b45c8708':
  lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>

They can be produced by VQF.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

* commit '8941971a':
  lavc: make error_rate a private option of mpegvideo encoders

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

* commit '728c4658':
  vdpau: add a constructor for AVVDPAUContext.

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

* commit 'ca22d1de':
  vdpau: add a convenience function for getting a decoder profile.

Conflicts:
	doc/APIchanges
	libavcodec/vdpau.c
	libavcodec/vdpau.h
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

The not handling of frame gaps has lead to the lack of a dummy reference
frame, which has lead to the failure of decode_slice_header() which has
lead to one SEI recovery message being skiped which had introduced a
slightly suboptimal recovery point for at least 1 h264 file compared to
JM.

Found-by: Carl & BugMaster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

No useful contents. Also hard to keep up-to-date.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Many minor fixes from: Stefano Sabatini <stefasab@gmail.com>.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

We should not arbitrarily decide the maximum B-frame number for all
encoders supported by Libav, each encoder should be able to set its own
limits.

They are mpegvideo-specific and not supposed to be used by callers.

We will likely want to add new fields to it in the future, so this is
needed to avoid breaking ABI.

Based on the code by Rémi Denis-Courmont <remi@remlab.net> from VLC.

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

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

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

* qatar/master:
  Deprecate obsolete XvMC hardware decoding support

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo.c
	libavcodec/options_table.h
	libavutil/pixdesc.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c7f7bfc9':
  Remove all Alpha architecture optimizations

Conflicts:
	libavcodec/alpha/asm.h
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/dsputil_alpha_asm.S
	libavcodec/alpha/hpeldsp_alpha.c
	libavcodec/alpha/hpeldsp_alpha.h
	libavcodec/alpha/hpeldsp_alpha_asm.S
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/alpha/motion_est_mvi_asm.S
	libavcodec/alpha/mpegvideo_alpha.c
	libavcodec/alpha/regdef.h
	libavcodec/alpha/simple_idct_alpha.c

We have a qemu based fate alpha client. And various failures
on alpha have previously pointed to issues in generic C code.
Thus IMHO it makes sense to keep alpha code as long as someone
is willing to do the little bit of maintaince it needs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '16381923':
  configure: Check whether MSVC requires using the C89-to-C99 converter
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This avoids frame duplication for null output
avoiding unneeded computations.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>