This should simplify merging
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Hopefully enhance readability.

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

Previously this was hardcoded to 4 seconds
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2593
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>

* qatar/master:
  proresdec: simplify slice component offsets handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cfbd98ab':
  mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac

Conflicts:
	libavcodec/mjpegdec.c

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

* commit 'c209d0df':
  fate.sh: add support for build-only FATE instances

Conflicts:
	doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a030279a':
  ljpeg: use the correct number of components in yuv

Conflicts:
	libavcodec/mjpegdec.c

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

* commit '8aa35009':
  mjpeg: Validate sampling factors

Conflicts:
	libavcodec/mjpegdec.c

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

Prevent out of buffer write when decoding broken samples.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

If the "build_only" variable is set in the configuration file, the
FATE client will skip running tests and just compile all targets.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

AMD Athlon(tm) II X3 450 Processor

size: 1048576  runs: 1024  time:    5.660 +- 0.023
size: 1048576  runs: 1024  time:    5.661 +- 0.030
size: 1048576  runs: 1024  time:    5.656 +- 0.022
size: 1048576  runs: 1024  time:    5.647 +- 0.026

size: 1048576  runs: 1024  time:    5.428 +- 0.037
size: 1048576  runs: 1024  time:    5.426 +- 0.034
size: 1048576  runs: 1024  time:    5.426 +- 0.034
size: 1048576  runs: 1024  time:    5.428 +- 0.038
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

They must be non-zero.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Fixes Ticket2425
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>

* qatar/master:
  mpegvideo: unref old current_picture before allocating a new one
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'db347280':
  vorbis: fallback to normal division instead of crashing

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

* commit 'ddf1b4a2':
  vorbis: simplify the inner loop in setup_classifs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '36f10380':
  vorbis: use normal integer values for iterators
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '98186578':
  vorbis: refactor vorbis_residue_decode_internal

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

* commit 'c360fb17':
  win32: Do not use GetProcAddress when compiled for Vista+
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0b6899f1':
  configure: msvc: Set the target windows version to XP if no target is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4-operation form is preferred over 3-operation because it breaks a long
dependency chain, thus allowing a superscalar processor to execute more
operations in parallel.
The idea was taken from: http://www.zorinaq.com/papers/md5-amd64.html

AMD Athlon(tm) II X3 450 Processor, x86_64

$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576  runs: 1024  time:    5.821 +- 0.019
size: 1048576  runs: 1024  time:    5.822 +- 0.019
size: 1048576  runs: 1024  time:    5.841 +- 0.018
size: 1048576  runs: 1024  time:    5.821 +- 0.018

$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576  runs: 1024  time:    5.646 +- 0.019
size: 1048576  runs: 1024  time:    5.646 +- 0.018
size: 1048576  runs: 1024  time:    5.642 +- 0.019
size: 1048576  runs: 1024  time:    5.641 +- 0.019
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>