* commit 'aba70bb5':
  Add missing headers to make template files compile (more) standalone
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e7373585':
  dsputil_template: Move bits that are used templatized into separate file

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

* commit 'd3c3c166':
  dsputil: Move hpel_template #include out of dsputil_template
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd0aabeab':
  x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation

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

This allows detemplatizing the bits that are not instantiated twice.

Multiple inclusion makes no sense as it is only used in the 8-bit case.

This fixes FATE with mmxext CPUFLAGS set.

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

This only uses the first slice, improvement here is welcome
analyzing all slices the trivial way would interfere with threads

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

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

* qatar/master:
  avcodec: add missing includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa499568':
  avconv: More descriptive message about framedrop
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6ee55c7b':
  vf_transpose: K&R formatting cosmetics

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

AV_CPU_FLAG_AVX is enabled at this point only if there's OS support.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3495.

Both of these dithering methods are from http://pippin.gimp.org/a_dither/ for
GIF they can be considered better than bayer (provides more gray-levels), and
spatial stability - often more than twice as good compression and less visual
flicker than error diffusion methods (the methods also avoids error-shadow
artifacts of diffusion dithers).

These methods are similar to blue/green noise type dither masks; but are
simple enough to generate their mask on the fly. They are still research work
in progress; though more expensive to generate masks (which can be used in a
LUT) like 'void and cluster' and similar methods will yield superior results

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket3152

This also removes the dependance on ff_init_block_index/ff_update_block_index()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  libx265: Only use one memcpy for headers

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

* commit '60728e8b':
  libx265: Write global extradata when requested

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

* commit '8ef33497':
  build: Add config option for CABAC code

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

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

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

* qatar/master:
  avconv: don't warn on multiple frames per packet for codecs that expect it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '47543450':
  avconv: print verbose per-stream transcoding statistics

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

* commit 'a220b07b':
  avconv: split printing the final statistics into a separate function

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

They're guaranteed by the x265 API to be contiguous in memory.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>