* commit '096cc11e':
  x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '31a23a0d':
  x86: dsputil_mmx: Remove leftover inline assembly fragments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These became unused in 71155d7b.
Signed-off-by: Martin Storsjö <martin@martin.st>

Fixes some of the issues with segment.mov

See: 0226 15:16 Joseph Artsimov (2.1K) [FFmpeg-devel] Two problems with MPEG2 decoder
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:
  configure: icc: Drop nonsense adding of cpuflags to LDFLAGS
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c242bbd8':
  Remove unnecessary dsputil.h #includes

Conflicts:
	libavcodec/ffv1.c
	libavcodec/h261dec.c
	libavcodec/h261enc.c
	libavcodec/h264pred.c
	libavcodec/lpc.h
	libavcodec/mjpegdec.c
	libavcodec/rectangle.h
	libavcodec/x86/idct_sse2_xvid.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '76b19a39':
  Fix a number of incorrect intmath.h #includes.
  avconv: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e8da8075':
  cmdutils: only use libavresample when it is enabled
  libschroedinger: cosmetics: rename variable avccontext to avctx
  vorbisenc: cosmetics: rename variable avccontext to avctx

Conflicts:
	cmdutils.c
	libavcodec/libschroedinger.c
	libavcodec/libschroedingerenc.c
	libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e951b6d9':
  vorbisdec: cosmetics: rename variable avccontext to avctx
  configure: Identify icc compiler with a less ambiguous pattern

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

* commit 'b58b00ae':
  configure: Separate "ln" command line arguments

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

this is needed for testing mmx2 functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes many icc warnings when not setting the CPU type.

avprobe and avserver use cmdutils and do not strictly require libavresample.

This is consistent with the rest of libavcodec.

This is consistent with the rest of libavcodec.

This is consistent with the rest of libavcodec.

Check whether CQ level is within qmin..qmax and abort on error. If this isn't properly
set, encoding will fail at the first frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Allow setting the min quantizer to 0 instead of 1 (libvpx allows 0); fixes #2136
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Its unlikely this affects any valid files.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is more compatible and not more complicated.

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:
  vorbisdec: Accept 0 amplitude_bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5b47c19b':
  vorbisdec: Add missing checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>