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:
  arm: Use the matching endfunc macro instead of the assembler directive directly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2ad4ee34':
  arm: Add a missing endfunc macro call
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

According to http://doc.iridas.com/index.php?title=LUT_Formats

    for 3D textures, the data is also RGB, and ordered in such a way
    that the red coordinate changes fastest, then the green coordinate,
    and finally, the blue coordinate changes slowest:

Fixes Ticket #3236.

Its usefull to know immediatly if extradata is wrong and not just when later
the decoder tries to use it.

This check was removed by: a6a2282cSigned-off-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>

* qatar/master:
  mpegvideo: remove disabled bfin asm

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

* commit 'a4d0c6e0':
  mpegvideo: move dct_unquantize functions up to avoid forward declarations

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

* commit 'aec25b1c':
  mpegvideo: split the encoding-only parts of frame_start() into a separate function

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

* commit 'b318106f':
  FATE: add a test for the lavr mixing case fixed in fc6a3ef4Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a8cc88b1':
  tests/Makefile: allow FILTER* to be called with lists of filter names
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cc976a75':
  audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fc6a3ef4':
  audio_mix: fix zeroing output channels in certain cases
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3d95d273':
  audio_mix: initialize the data pointers to NULL
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '58312b24':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e89aa4bf':
  lzw: switch to bytestream2

Conflicts:
	libavcodec/lzw.c

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

* commit '1b5d065c':
  pmpdec: check that there is at least one audio packet.

Conflicts:
	libavformat/pmpdec.c

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

* commit '94a417ac':
  mathematics: remove asserts from av_rescale_rnd()

Conflicts:
	libavutil/mathematics.c

The asserts are left in place for now as no code checks the return
value, but we sure can change this if application developers
prefer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '24057c83':
  eacmv: check the framerate before setting it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5569146d':
  adx: check that the offset is not negative

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

* commit 'a6a2282c':
  rv30: fix extradata size check.

Conflicts:
	libavcodec/rv30.c

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

* commit 'feded990':
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
	libavcodec/mpegvideo.c

The picture type is left at P type as it was explicitly set before
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

With interlaced vc1 it was possible that accesses could happen outside these
tables before this.

Regression since 017e234c
Reproduced with a sample from Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Fixes (again) : 480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.SIGFPE.bfa.390.wmv
No releases are affected by this
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The error was fixed in commit ce9bd303
more than one year ago, and does not affect all the currently supported
versions.

In particular, fix trac issue #1535.

It has been disabled as 'broken' over 3 years ago in b716a792

This introduces some code duplication. However, much of it should go
away once the decoders stop using MpegEncContext.

Specifically, when the corresponding input channel exists and its matrix
column is all-zero (which is necessary for zeroing the output), the
matrix column must be removed from the matrix.

This is not done currently, so the mixing code would end up using
uninitialized pointers from stack.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind