Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The original patch  seems to be missing a 16x16 function though
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows further unrolling the DSP implementation where possible.

x86 and ARM DSP modified by simply moving the multiple calls from vc1dec
to the DSP code. Decoding improvements should only occurs because of the
compiler actually able to unroll more.

Decoding time: ~8.80s -> 8.64s (ie around 2%)
Signed-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>

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

Fixes exif decoding failure of 1295328_300.jpg

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

No working testcase, this omission was just spoted when the parser apparently went out of
sync.

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* lukaszmluki/master:
  lavd/xv: implement repaint message
  lavd/xv: add window id param
  lavd/xv: keep aspect ratio
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '911fa05b':
  mvc: Specify the pixel format for the mv-mvc* tests

Conflicts:
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Also set the RGBA pixel format correctly as the native endian format,
which is what it returns.

This fixes the tests on big endian.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '6dfd99c9':
  fate: add tests for SGI RLE and MVC1&2 decoders

Conflicts:
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '55ddd700':
  Silicon Graphics Movie demuxer

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

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

* commit '86a04326':
  Silicon Graphics Motion Video Compressor 1 & 2 decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/mvcdec.c
	libavcodec/version.h

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

* commit '07761294':
  Silicon Graphics RLE 8-bit video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/avcodec.h
	libavcodec/sgirledec.c
	libavcodec/version.h

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

* commit '34c5a666':
  h264: codec reinit: remove statements without effect

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

* commit '6ef96292':
  utils: add yvyu422 to avcodec_align_dimensions2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd23fc884':
  filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '58400ac1':
  lavfi: name anonymous structs

Conflicts:
	libavfilter/buffersink.c
	libavfilter/f_select.c
	libavfilter/src_movie.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_overlay.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

In the 2 FILTER_INIT usages, the source is already preloaded so that
extra complexity taken from FILTER_UPDATE is not necessary.

Also add forgotten "mask" argument in FILTER_{INIT,UPDATE} comments.

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

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

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

avctx->coded_{height,width} will always equal h->{height,width} since
init_dimensions() does that explicitly, Size changes are detected by
changes in mb_{height,width} earlier and propagated through the
needs_reinit variable.

Use the xm# and ym# aliases as they remain in sync with m# after a SWAP.
No actual changes to the assembly.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Fix compilation with !HAVE_6REGS.
  Use MANGLE in cavsdsp.c to save two registers using gcc.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4936ef64':
  configure: Handle armcc 5.0

Conflicts:
	configure

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

The first line of the "armcc --vsn" output in one version is
"Product: ARM Compiler 5.04".
Signed-off-by: Martin Storsjö <martin@martin.st>

Can be tested with:
$ ./configure --cc='cc -m32' --disable-optimizations --enable-pic

Fixes compilation with !HAVE_6REGS.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.

[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]

Fixes ticket #3530.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>