See git blame of pre split avfilter/vf_hqdn3d.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reference: 7a1944b9Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  vf_hqdn3d: x86: Add proper arch optimization initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes a part of ticket #2190.

Tested-on: Fedora Core 14, 16, and 17.
Tested-on: Ubuntu by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The non-alpha and alpha-Y planes are cleared in the idct_put/add()
calls. For the alpha U/V planes, we only care about the DC for entropy
context prediction purposes, the rest of the data is unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #2218.

Fixes ticket #2163.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Properly declare it like a @subsection, rather than as a @section.

* qatar/master:
  Use proper "" quotes for local header #includes
  ppc: fmtconvert: Drop two unused variables.
  bink demuxer: set framerate.

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

* commit '1730ca2e':
  bink demuxer: check malloc return value

See:
commit e400b95b
Author: Paul B Mahol <onemda@gmail.com>
Date:   Sat Jun 9 10:57:14 2012 +0000

    bink: check av_mallocz() return value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f2960097':
  bink: fix a check for the first frame.
  doc/developer: Drop obsolete MPlayer reference
  doc/developer: Add ISC license to list of acceptable licenses
  doc/developer: Add web links for all suggested licenses

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

Packet pts is a very unreliable indicator, use
AVCodecContext.frame_number instead.

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

* mjbshaw/master:
  libopenjpegenc: simplify switch statement
  libopenjpegenc: add support for pix fmt gbrp (8-16 bit)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

the fieldtx_plane is not cleared for interlaced fields
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>

Fixes corruption of motion_val
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-By: Giorgio Vazzana <mywing81@gmail.com>

Note: The ret variable was unused.

The value is lost because of avfilter_copy_buffer_ref_props().

Fix trac ticket #2217.

Without that test, ff_bufqueue_add silently discards the
oldest buffer, that leaves in[i].nb_samples inconsistent,
and causes later a segfault.

* qatar/master:
  x86: hpel: Move {avg,put}_pixels16_sse2 to hpeldsp
  configure: Add a comment indicating why uclibc is checked before glibc
Merged-by: Michael Niedermayer <michaelni@gmx.at>