Merge remote-tracking branch 'qatar/master'

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

Conflicts:
libavcodec/lagarith.c

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

Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'

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

Conflicts:
libavcodec/svq3.c

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

Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

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

Conflicts:
libavcodec/x86/dsputil_x86.h

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

Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

* commit 'ae116cd3ed908d28b69d5198712217ec743d74f6':
  ppc: dsputil: Move hpeldsp-related declarations to a separate header

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

Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
  x86: dsputil: Move fpel declarations to a separate header

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

Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'

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

Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'

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

Conflicts:
libavcodec/imgconvert.c

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

Merge commit '600b854ad8173995518bd917e7f86120b5505088'

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

Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'

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

Conflicts:
libavcodec/x86/dsputil_mmx.c

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

Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

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

Conflicts:
libavcodec/nuv.c

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

avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD

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

avutil/mem: avoid using intptr_t to access void* in av_dynarray_add()

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

lavu/mem: reimplement the dynarray functions with the macro.

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

lavu: add AV_DYNARRAY_ADD() macro.

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>

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>

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>

lagarith: Fix typo in printf format string

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

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>

fate: add cine demux test

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

avcodec/snowenc: make snow non experimental

After this commit the created bitstream will be supported by future
decoders.

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

udp: try to clarify verbiage on buffer_size

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>

dsputil: Move thirdpel-related bits into their own context

x86: dsputil: Move hpeldsp-related declarations to a separate header

ppc: dsputil: Move hpeldsp-related declarations to a separate header

x86: dsputil: Move fpel declarations to a separate header

dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

x86: dsputil: Move inline assembly macros to a separate header

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.

float_dsp: Replace arch optimization ifdefs by if cascade

Arch-specific optimizations are handled this way everywhere else.

avcodec: more correct printf specifiers

Additional icl inline asm fix.

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

avfilter: more correct printf format specifiers

lavc/libx264: add a warning when using qscale

This addresses ticket #3238.

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

dshow: use distinct buffers per stream.

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>

elbg: change utility_inc to 64bit

Fixes integer overflow
Fixes Ticket3462

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

avformat/mp3enc: use av_copy_packet()

Fixes double free
Fixes Ticket3476

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

avcodec/snowdec: also print qbias and mvscale in debug output

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

avcodec/snowdec: forward error codes

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

avcodec/snowdec: return more specific error codes

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

avcodec/snowenc: simplify spatial_decomposition_count seting code

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

http: never send 'Cookie: (null)' to the server

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>

avcodec/snowenc: allow larger mb variances

Fixes assertion failure
Fixes Ticket3463

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

avcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit

This avoids hypothetical integer overflows

avcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bit

This avoids a hypothetical integer overflow with very high resolution video

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

avcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit

This avoids a hypothetical integer overflow with very high resolution video

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

configure: Try to fix detection of ARM Compiler 5.04

Fixes Ticket 3364

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

ffmpeg: dont call exit_program() from a signal hander

This is unsafe and can deadlock amongth other things

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

doc/examples/avcodec: information regarding gop_size ignored if frame->pic-type is AV_PICTURE_TYPE_I

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

avcodec/x86/snowdsp: add missing clobbers to inner_add_yblock_bw_8_obmc_16_bh_even_sse2() and inner_add_yblock_bw_16_obmc_32_sse2()

Note, these functions are currently disabled

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

avcodec/snowdec: provide information about the wavelet with -debug 1

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame

Conflicts:
libavcodec/vaapi.c
libavcodec/vaapi_internal.h

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

Merge commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0'

* commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0':
  vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame

Conflicts:
libavcodec/vdpau_internal.h
libavcodec/vdpau_vc1.c

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

Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'

* commit '7948a51b5c3d08e1a1173442a7ff72b220def303':
  vdpau: don't assume Picture and H264Picture are the same

Conflicts:
libavcodec/vdpau.c

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

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

* commit '82bb3048013201c0095d2853d4623633d912252f':
  dsputil: Use correct type in me_cmp_func function pointer

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

Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'

* commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18':
  build: Group general components separate from de/encoders in arch Makefiles

Conflicts:
libavcodec/arm/Makefile
libavcodec/x86/Makefile

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

Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'

* commit '54a6e08a650a71fd375551585b0ea40a3a06d228':
  dsputil: Conditionally compile dsputil code on all architectures

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

Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'

* commit '5169e688956be3378adb3b16a93962fe0048f1c9':
  dsputil: Propagate bit depth information to all (sub)init functions

Conflicts:
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputil_init.c

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

Merge commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e'

* commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e':
  arm: dsputil: K&R formatting cosmetics

Conflicts:
libavcodec/arm/dsputil_init_arm.c

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

Merge commit '1675975216ecbea8e4826235f204dc0f4234383f'

* commit '1675975216ecbea8e4826235f204dc0f4234383f':
  ppc: dsputil: Drop trailing semicolon from macros

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

Merge commit 'b7d24fd4b2213104c001ed504074495568600b9c'

* commit 'b7d24fd4b2213104c001ed504074495568600b9c':
  ppc: dsputil: Merge some declarations and initializations

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

Merge commit 'b045283f2126637477a597f184638ebef09bf898'

* commit 'b045283f2126637477a597f184638ebef09bf898':
  ppc: dsputil: Simplify some ifdeffed function definitions

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

Merge commit '8bd6f88266740068415f7da0628117f1b802efb9'

* commit '8bd6f88266740068415f7da0628117f1b802efb9':
  ppc: dsputil: Drop some unnecessary parentheses

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

Merge commit '022184a646896c6b27c6cca387039b030685266e'

* commit '022184a646896c6b27c6cca387039b030685266e':
  ppc: dsputil: more K&R formatting cosmetics

Conflicts:
libavcodec/ppc/gmc_altivec.c

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

Merge commit '30f3f959879eee7890973e8cc9ce076450ced111'

* commit '30f3f959879eee7890973e8cc9ce076450ced111':
  ppc: dsputil: K&R formatting cosmetics

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

Merge commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1'

* commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1':
  ppc: dsputil: comment formatting and wording/grammar improvements

Conflicts:
libavcodec/ppc/gmc_altivec.c
libavcodec/ppc/idct_altivec.c

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

Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'

* commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e':
  hpeldsp_template: Merge some declarations and initializations

Conflicts:
libavcodec/hpeldsp_template.c

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

Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'

* commit '2539cf1c814190a017cb8986b41aa2f949e37fd9':
  hpeldsp_template: K&R formatting cosmetics

Conflicts:
libavcodec/hpeldsp_template.c

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

Merge commit '2972087e398454122a82a970ed07924185175c6d'

* commit '2972087e398454122a82a970ed07924185175c6d':
  hpel_template: Drop some unnecessary parentheses

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

Merge commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224'

* commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224':
  hpel_template: K&R formatting cosmetics

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

vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame

Signed-off-by: Anton Khirnov <anton@khirnov.net>

vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame

This gets rid of aliasing completely unrelated structs to Picture.

Fixes the remaining compilation warnings in the vdpau code.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

vdpau: don't assume Picture and H264Picture are the same

The code passed H264Picture* and Picture*, and assumed the
hwaccel_picture_private field was in the same place in both
structs. Somehow this happened to work in Libav, but broke in
FFmpeg (and probably subtly breaks in Libav too).

Signed-off-by: Anton Khirnov <anton@khirnov.net>

ffmpeg: try to avoid calling av_log() from sigterm_handler()

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

configure: fix direct symbol ref support detection

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

dsputil: Use correct type in me_cmp_func function pointer

build: Group general components separate from de/encoders in arch Makefiles

This is in line with how the top-level libavcodec Makefile is structured.

dsputil: Conditionally compile dsputil code on all architectures

dsputil: Propagate bit depth information to all (sub)init functions

This avoids recalculating the value over and over again.

arm: dsputil: K&R formatting cosmetics

ppc: dsputil: Drop trailing semicolon from macros

This allows for a more natural macro usage.

ppc: dsputil: Merge some declarations and initializations

ppc: dsputil: Simplify some ifdeffed function definitions

ppc: dsputil: Drop some unnecessary parentheses

ppc: dsputil: more K&R formatting cosmetics

ppc: dsputil: K&R formatting cosmetics

ppc: dsputil: comment formatting and wording/grammar improvements

hpeldsp_template: Merge some declarations and initializations

hpeldsp_template: K&R formatting cosmetics

hpel_template: Drop some unnecessary parentheses

hpel_template: K&R formatting cosmetics

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float-dsp-test: do not use C99's predefined  __func__

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

float-dsp-test: do not use C99's predefined  __func__

It is not supported by all compilers on FATE. Fixes "some test were
skipped" errors.

swresample: add swri_resample_float_sse

At least two times faster than the C version.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

truehd: tune VLC decoding for ARM.

Profiling on a Raspberry Pi revealed the best performance to correspond
with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function
in particular are as follows:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
6:2 total     348.8  20.1     339.6  15.1    88.8%       +2.7%  (insignificant)
6:2 function  38.1   8.1      26.4   4.1     100.0%      +44.5%
8:2 total     339.1  15.4     324.5  15.5    99.4%       +4.5%
8:2 function  33.8   7.0      27.3   5.6     99.7%       +23.6%
6:6 total     604.6  20.8     572.8  20.6    100.0%      +5.6%
6:6 function  95.8   8.4      68.9   8.2     100.0%      +39.1%
8:8 total     766.4  17.6     741.5  21.2    100.0%      +3.4%
8:8 function  106.0  11.4     86.1   9.9     100.0%      +23.1%

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: Use LOCAL_ALIGNED for instead of DECLARE_ALIGNED within functions

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

Merge commit '606cc8afa1cb782311f68560c8f9bad978cdcc32'

* commit '606cc8afa1cb782311f68560c8f9bad978cdcc32':
  configure: ppc: Disable ldbrx instruction by default

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

Merge commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004'

* commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004':
  mxf: Lowercase UL strings

Conflicts:
libavformat/mxfdec.c

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