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

* commit '5c018ee1':
  DirectDraw Surface image decoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h
	tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This should avoid problems on systems with little stack space and fix some crashes
in fate

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

This avoids test failure due to differing rounding between 32 and 64bit x86

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

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

* commit '7ca3e520':
  Hap decoder and encoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/allcodecs.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The function is specific to little endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c0b10575':
  txd: Use the TextureDSP module for decoding

Conflicts:
	configure
	libavcodec/s3tc.c
	libavcodec/s3tc.h
	libavcodec/txd.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8337e0c5':
  Introduce a TextureDSP module
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2ecfd451':
  Implement Snappy decompression
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This patch adds MSA (MIPS-SIMD-Arch) optimizations for block functions in new file blockdsp_msa.c
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
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 probably makes no difference but its more proper
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Using the internal DXTC routines brings support for non multiple of 4
textures. A new test is added to cover this feature. Hashes differ
since the decoding algorithm is different, though no visual changes
have been spotted.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

This module implements generic texture decompression from different
families (DXTC, RGTC, BCn) and texture compression DXTC 1, 3, and 5.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

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

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

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

* commit '61dc9d64':
  udp: Fix local_port management

Conflicts:
	libavformat/udp.c

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

The default value for unset is -1, not 0.

Problem introduced in 66028b7b

This reduces the number of operations
Its not done for 9/7i as that would overflow thanks to JPEG2000 allowing
32 decomposition levels
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This significantly improves the quality when the integer 9/7 transform
is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This reduces the number of operations done and is equivalent except for
rounding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

this makes them accessible by the rest of the jpeg2000 code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

thats how the specification defines it, this also improves numerical
accuracy of the integer wavelet implementation. It otherwise should
be equivalent, in case of overflows this can be reverted.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

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

* commit '8655c541':
  libvpx: Support the vp9 extended profiles

Conflicts:
	Changelog
	configure
	libavcodec/libvpx.c
	libavcodec/libvpx.h
	libavcodec/libvpxdec.c
	libavcodec/libvpxenc.c
	libavcodec/version.h

mostly not merged, as requested by jamrial

See: 01e59d48
See: 079b7f6e and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '05bf3f54':
  libvpx: Do not set vp8 only parameters when encoding in vp9

Conflicts:
	libavcodec/libvpxenc.c

See: 238ec505
See: ae330070Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c060d046':
  af_resample: Set the number of samples in the last frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6ec688e1':
  mp3: enable packed main_data decoding in MP4

Conflicts:
	libavcodec/mpegaudiodec_template.c

Only the parts needed to support the available sample are merged
the remaining error checks are left in place
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Even if the jpeg2000 spec uses a wrong value this does not
make mathematics work this way, also this has been corrected in the 2004
version AFAIK
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

or if no rematrix and no resampling is performed and the input is 16bit
note reampling and rematrix itself always use more than 16bit internally
the "internal" sampling format is the format between these steps

Its unlikely the difference from this commit is audible in any case
unless there is some bug either before or after the change.
but multiple people prefer this and it slightly improves the precission
of computations.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>