avfilter: more correct printf format specifiers
mpegts: move last_pcr to MpegTSFilter level

Signed-off-by: Marton Balint <cus@passwd.hu>
mpegts: factorize mpegts filter creator code

Signed-off-by: Marton Balint <cus@passwd.hu>
mpegts: add pcr filter for tracking standalone pcr pids

Signed-off-by: Marton Balint <cus@passwd.hu>
mpegts: fix teletext pts of streams with standalone pcr pid

Signed-off-by: Marton Balint <cus@passwd.hu>
avcodec: more correct printf specifiers
float_dsp: Replace arch optimization ifdefs by if cascade

Arch-specific optimizations are handled this way everywhere else.
nuv: Reuse the DSPContext from RTJpegContext

There is no point in populating NuvContext with another DSPContext.

Also split static and dynamic initialization bits to avoid running the
static initialization parts over and over.
x86: dsputil: Move inline assembly macros to a separate header
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
x86: dsputil: Move fpel declarations to a separate header
ppc: dsputil: Move hpeldsp-related declarations to a separate header
x86: dsputil: Move hpeldsp-related declarations to a separate header
dsputil: Move thirdpel-related bits into their own context
Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'

* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
  avfilter: more correct printf format specifiers

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/vf_showinfo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lagarith: Fix typo in printf format string

libavcodec/lagarith.c:671:16: warning: '#' flag used with ‘%u’ gnu_printf format [-Wformat]
Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'

* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
  avcodec: more correct printf specifiers

Conflicts:
	libavcodec/4xm.c
	libavcodec/alsdec.c
	libavcodec/dfa.c
	libavcodec/h264_ps.c
	libavcodec/jpeg2000dec.c
	libavcodec/lagarith.c
	libavcodec/mpeg12dec.c
	libavcodec/rv10.c
	libavcodec/svq3.c
	libavcodec/wmaprodec.c
	libavcodec/xwddec.c

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

* qatar/master:
  float_dsp: Replace arch optimization ifdefs by if cascade

Conflicts:
	libavutil/float_dsp.c

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