x86: h264qpel: int --> ptrdiff_t for some line_size parameters
x86: dsputil: ff_h263_*_loop_filter declarations to a more suitable place
x86: dsputil: Refactor some ff_{avg|put}_pixels function declarations
x86: dsputil: cosmetics: Remove two pointless variable indirections
x86: dsputil: Move some ifdefs to avoid unused variable warnings
Merge commit 'a89c05500f68d94a0269e68bc522abfd420c5497'

* commit 'a89c05500f68d94a0269e68bc522abfd420c5497':
  x86: h264qpel: int --> ptrdiff_t for some line_size parameters

Conflicts:
	libavcodec/x86/qpelbase.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'e027032fc6a49db5a4ce12fc3e09ffb86ff20522'

* commit 'e027032fc6a49db5a4ce12fc3e09ffb86ff20522':
  x86: dsputil: ff_h263_*_loop_filter declarations to a more suitable place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256'

* commit 'c51a3a5bd9a5b404176ff343ecadb80b2553b256':
  x86: dsputil: Refactor some ff_{avg|put}_pixels function declarations

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/utils: use @code markup for opencl function names.
Merge commit '2004c7c8f763280ff3ba675ea21cf25396528fd3'

* commit '2004c7c8f763280ff3ba675ea21cf25396528fd3':
  x86: dsputil: cosmetics: Remove two pointless variable indirections

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Move some ifdefs to avoid unused variable warnings

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avutil/opencl: merge opencl env to opencl context

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