Signed-off-by: Paul B Mahol <onemda@gmail.com>

In order to encapsuate Opus in Matroska, there is a new element
that has been added to the Matroska Spec, SeekPreRoll. It has the
duration in nanoseconds that has to be decoded before every seek.
Spec: http://matroska.org/technical/specs/index.html#SeekPreRoll
Proposal for encapsulateing Opus in Matroska:
http://wiki.xiph.org/MatroskaOpusSigned-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This reverts commit bf36dc50, reversing
changes made to b7fc2693.

Conflicts:

	libavcodec/h264.c

Keeping support for the old VDPAU API has been requested by our VDPAU maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Uses the 2.5 compatibility header included with the variant of
FFMS2 that uses AviSynth's C-interface. A copy of this header is
now provided in compat/avisynth.

avs_get_row_size_p and avs_get_height_p changed between versions
2.5 and 2.6. Since the avisynth_c.h header that avformat uses
assumes AviSynth 2.6, it would cause 2.5 to crash if given any
kind of real video (the Version() function was known to work,
though).

AvxSynth was unaffected by this issue because, despite being based
on AviSynth 2.5.8 and using 2.5.8's interface version number of 3,
it actually uses 2.6's versions of these functions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The case where decoding should only happen for keyframes and afterwards
(CODEC_FLAG2_SHOW_ALL not set) does not fully work neither before nor
after this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  dxa: Make sure the reference frame exists

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

* commit 'c59967fa':
  h261: check the mtype index

Conflicts:
	libavcodec/h261dec.c

The right half of the check is impossible to be true and thus replaced by
an assert()

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

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

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

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

This allows to apply different bitstream filters to different outputs,
with no need to transcode.

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

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

The functions are unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* qatar/master:
  altivec: perform an explicit unaligned load
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9d86bfc2':
  hlsenc: Don't reset the number variable when wrapping

Conflicts:
	libavformat/hlsenc.c

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

* commit '09c93b1b':
  hlsenc: Append the last incomplete segment when closing the output

Conflicts:
	libavformat/hlsenc.c

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

* commit 'c9031c7c':
  hlsenc: Add a proper dependency on the mpegts muxer

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

* commit '239f55bf':
  vp56data: Move all data tables to the .c file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cb214707':
  vp56data: Move all shared enum/struct declarations to common header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '38f64c03':
  mpeg12decdata.h: Move all tables to the only place they are used

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

* commit 'ec6c1b1d':
  mpeg12decdata: Remove unused #define
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c591d457':
  avcodec: Replace local extern declarations for tables with header #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa2ba8c9':
  swscale: Move extern declarations for tables to swscale_internal.h

Conflicts:
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd2585315':
  swscale: Mark a bunch of tables only used within one file static

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

* commit '060ce0c6':
  ivi_common: Make some tables only used within the file static
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4b054a34':
  rtpproto: Check the right feature detection macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '163a7297':
  electronicarts: Let functions always returning the same value return void
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4908c8ef':
  electronicarts: Improve some function/variable names

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

* commit 'a90cff13':
  electronicarts: comment wording fixes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '288f2ffb':
  electronicarts: Remove bogus function documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>