* commit '71469f3b':
  x86: dsputil: Move constant declarations into separate header

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

* commit 'ed880050':
  x86: dsputil: Group all assembly constants together in constants.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '87614667':
  x86: dsputil: Move ff_pd assembly constants to the only place they are used

Conflicts:
	libavcodec/x86/lpc.c
Merged-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>

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

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>

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>

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

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

* qatar/master:
  msvc: Move linker pragma from config.h to libavutil/internal.h

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

* commit 'bd392785':
  fate-run: Drop unnecessary regtest() indirection

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

* commit '1b343ced':
  x86: dsputil: Remove unused ff_pb_3F constant
  x86: dsputil: Remove unused MOVQ_BONE macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '63bac48f':
  x86: dsputil: Move rv40-specific functions where they belong

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

* commit '92f8e06e':
  x86: dsputil hpeldsp: Move shared template functions into separate object

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

* commit '7edaf4ed':
  x86: rnd_template: Eliminate pointless OP_AVG macro indirection
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'db9aee6c':
  oma: properly forward errors in oma_read_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6f98508e':
  oma: return meaningful errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e55e8b2c':
  lavc: do not leak frames in avcodec_decode_audio4

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

* commit 'e0c53c34':
  nut: use meaningful error values
  FATE: use a less ambiguous end time for filter-trim-time test

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

This is in line with the new name for the libavfilter variable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9779f930':
  configure: add dependencies to lavfi .pc file

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

* commit 'bce70f81':
  configure: make avconv select (a)trim filters

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

* commit '481575d2':
  avconv: remove -deinterlace

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.c
	ffmpeg_opt.c

The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a97d8cc1':
  indeo3: use unaligned reads on reference blocks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '70f96615':
  jpeg2000dec: initialize static data just once
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '45a1694f':
  jpeg2000dec: cleanup properly after decoding errors

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

MSVC complains about the 32bits addressing, while mingw/gcc does not.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also extend documentation accordingly.

In particular, mention the fact that the amortized element addition cost
is constant.

Fixes a few green artifacts at the top
Fixes rest of Ticket 2535
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes green trash
Fixes part of Ticket2535
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>