* commit 'e5447826':
  riff: Move guid structs and helper functions into riff

Conflicts:
	libavformat/asf.h
	libavformat/riff.c
	libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8e329dba':
  riff: check for eof if chunk size and code are 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1c88617b':
  riff: K&R formatting cosmetics

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

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

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

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

Fixes CID1005310
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Prevent an infinite loop.

Inspired by a patch from Michael Niedermayer

CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Should fix Coverity CID 1005313, 1005314, 1005315.

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

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

Current method for constraining fragment position drift suffers from
round-off error build up.

Instead of calculating cumulative drift as a sum of input fragment
position corrections, it is more accurate to calculate drift as the
difference between current fragment position and the ideal position
specified by the tempo scale factor.
Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

valgrind reported uninitialized memory access which was caused by
incorrect number of samples being passed to push_samples(..)
Signed-off-by: Pavel Koshevoy <pkoshevoy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  ppc: hpeldsp: Include attributes.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The value of coeff_per_sb_select depends on the bit rate, not on
sub_sampling.
Also remove the calculation of tmp, no longer needed.

Fixes tickets #1868 and #742 (only audio part)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* cus/stable:
  ffplay: only do early frame drop if video queue is not empty
  ffplay: use AV_NOPTS_VALUE video frame pts instead of using 0
  ffplay: simplify aspect ratio calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes ticket #2446.
Signed-off-by: Marton Balint <cus@passwd.hu>

Assuming 0 pts may lead to bad framedrop decisions...
Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

* qatar/master:
  x86: Remove unused inline asm instruction defines
  vc1: Remove now unused variables
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '287c8db3':
  cosmetics: bfin: Fix indentation in the dsputil init function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd4d186d1':
  dsputil: Remove non-8bpp draw_edge

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

* commit 'c9f5fcd0':
  dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge

Conflicts:
	libavcodec/dsputil.c

No difference as this has been part of ffmpeg since a while and
the rebased commit does also not introduce new changes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '619e0da1':
  dsputil: Remove unused 32-bit functions

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

* commit 'c443117f':
  dsputil: Remove dct_bits

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

This fixes building in configurations where altivec is disabled.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit '54cd5e4f':
  dsputil: Remove hpel functions (moved to hpeldsp)

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

* commit '2957d29f':
  alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/alpha/hpeldsp_alpha.c
	libavcodec/alpha/hpeldsp_alpha.h
	libavcodec/alpha/hpeldsp_alpha_asm.S
	libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>