* 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>

* 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>

This addresses ticket #3238.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Basically sometimes if you start dropping video packets, you also drop audio packets. Now they each have separate buffers to avoid this unexpected behavior.
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes integer overflow
Fixes Ticket3462
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes double free
Fixes Ticket3476
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

If a domain has some cookies set, but matching the cookie fails due to
the port being different, get_cookies() succeeds, but sets cookies to
NULL. The caller of get_cookies() didn't check for the NULL value.

This also avoids passing NULL to libc string functions, which is
undefined behavior

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

Fixes assertion failure
Fixes Ticket3463
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids hypothetical integer overflows

This avoids a hypothetical integer overflow with very high resolution video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids a hypothetical integer overflow with very high resolution video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This is unsafe and can deadlock amongth other things
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>