* commit '0f0d1d05':
  configure: Always use -DOPJ_STATIC when checking for openjpeg

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

* commit '1e9db41e':
  movenc: Allow override of major brand in ftyp atom

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

Unbreaks windows systems not providing pkgconf files.
Reported-By: Rafaël Carré <funman@videolan.org>

Signed-off-by: Tim Walker <tdskywalker@gmail.com>

This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame
Which can happen if they are shiped in seperate binary packages and libavutil is upgraded

A cleaner alternative would be to replace them by pointers but this would likely cause
a small speedloss
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cus/stable:
  mpegts: fix teletext pts of streams with standalone pcr pid
  mpegts: add pcr filter for tracking standalone pcr pids
  mpegts: factorize mpegts filter creator code
  mpegts: move last_pcr to MpegTSFilter level
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  lagarith: Fix typo in printf format string

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

* commit '57f09608':
  dsputil: Move thirdpel-related bits into their own context

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

* commit '82dd1026':
  x86: dsputil: Move hpeldsp-related declarations to a separate header

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

* commit 'ae116cd3':
  ppc: dsputil: Move hpeldsp-related declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6655c933':
  x86: dsputil: Move fpel declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '322a1dda':
  dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

Conflicts:
	libavcodec/arm/hpeldsp_init_arm.c
	libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f9279ee7':
  dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

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

* commit '600b854a':
  imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

Conflicts:
	libavcodec/imgconvert.c
	libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1a8d0cf7':
  x86: dsputil: Move inline assembly macros to a separate header

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

* commit '1df0b061':
  nuv: Reuse the DSPContext from RTJpegContext

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

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

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

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Nicolas George <george@nsup.org>
Reviewed-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit 'cc8163e1':
  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>

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

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

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

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

After this commit the created bitstream will be supported by future
decoders.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough

which can happen easily in linux
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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.

Arch-specific optimizations are handled this way everywhere else.

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