ffmpeg.git
6 years agoMerge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
Michael Niedermayer [Sat, 22 Mar 2014 22:26:23 +0000 (23:26 +0100)]
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>
6 years agoMerge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'
Michael Niedermayer [Sat, 22 Mar 2014 22:21:54 +0000 (23:21 +0100)]
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>
6 years agoMerge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'
Michael Niedermayer [Sat, 22 Mar 2014 22:16:41 +0000 (23:16 +0100)]
Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6655c933a887a2d20707fff657b614aa1d86a25b'
Michael Niedermayer [Sat, 22 Mar 2014 22:02:46 +0000 (23:02 +0100)]
Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'
Michael Niedermayer [Sat, 22 Mar 2014 21:30:20 +0000 (22:30 +0100)]
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>
6 years agoMerge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
Michael Niedermayer [Sat, 22 Mar 2014 21:23:04 +0000 (22:23 +0100)]
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>
6 years agoMerge commit '600b854ad8173995518bd917e7f86120b5505088'
Michael Niedermayer [Sat, 22 Mar 2014 21:17:54 +0000 (22:17 +0100)]
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>
6 years agoMerge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'
Michael Niedermayer [Sat, 22 Mar 2014 21:11:17 +0000 (22:11 +0100)]
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>
6 years agoMerge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'
Michael Niedermayer [Sat, 22 Mar 2014 20:58:04 +0000 (21:58 +0100)]
Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

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

Conflicts:
libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD
Michael Niedermayer [Sat, 22 Mar 2014 20:47:38 +0000 (21:47 +0100)]
avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/mem: avoid using intptr_t to access void* in av_dynarray_add()
Michael Niedermayer [Sat, 22 Mar 2014 20:14:57 +0000 (21:14 +0100)]
avutil/mem: avoid using intptr_t to access void* in av_dynarray_add()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/mem: reimplement the dynarray functions with the macro.
Nicolas George [Sat, 8 Mar 2014 20:27:00 +0000 (21:27 +0100)]
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>
6 years agolavu: add AV_DYNARRAY_ADD() macro.
Nicolas George [Sat, 8 Mar 2014 20:26:59 +0000 (21:26 +0100)]
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>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 22 Mar 2014 17:52:21 +0000 (18:52 +0100)]
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>
6 years agoMerge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'
Michael Niedermayer [Sat, 22 Mar 2014 17:43:40 +0000 (18:43 +0100)]
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>
6 years agoMerge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'
Michael Niedermayer [Sat, 22 Mar 2014 17:21:10 +0000 (18:21 +0100)]
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>
6 years agofate: add cine demux test
Peter Ross [Fri, 21 Mar 2014 04:12:22 +0000 (15:12 +1100)]
fate: add cine demux test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowenc: make snow non experimental
Michael Niedermayer [Thu, 13 Mar 2014 17:16:21 +0000 (18:16 +0100)]
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>
6 years agoudp: try to clarify verbiage on buffer_size
rogerdpack [Fri, 21 Mar 2014 23:53:19 +0000 (17:53 -0600)]
udp: try to clarify verbiage on buffer_size

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unabl...
rogerdpack [Fri, 21 Mar 2014 23:37:42 +0000 (17:37 -0600)]
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>
6 years agodsputil: Move thirdpel-related bits into their own context
Diego Biurrun [Sat, 21 Dec 2013 15:03:59 +0000 (16:03 +0100)]
dsputil: Move thirdpel-related bits into their own context

6 years agox86: dsputil: Move hpeldsp-related declarations to a separate header
Diego Biurrun [Wed, 29 Jan 2014 13:57:10 +0000 (14:57 +0100)]
x86: dsputil: Move hpeldsp-related declarations to a separate header

6 years agoppc: dsputil: Move hpeldsp-related declarations to a separate header
Diego Biurrun [Thu, 30 Jan 2014 00:06:28 +0000 (16:06 -0800)]
ppc: dsputil: Move hpeldsp-related declarations to a separate header

6 years agox86: dsputil: Move fpel declarations to a separate header
Diego Biurrun [Tue, 28 Jan 2014 17:19:21 +0000 (18:19 +0100)]
x86: dsputil: Move fpel declarations to a separate header

6 years agodsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
Diego Biurrun [Sat, 21 Dec 2013 16:33:17 +0000 (17:33 +0100)]
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

6 years agodsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Diego Biurrun [Sun, 22 Dec 2013 15:25:24 +0000 (16:25 +0100)]
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

6 years agoimgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
Diego Biurrun [Mon, 27 Jan 2014 13:27:04 +0000 (14:27 +0100)]
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

6 years agox86: dsputil: Move inline assembly macros to a separate header
Diego Biurrun [Mon, 27 Jan 2014 14:06:54 +0000 (15:06 +0100)]
x86: dsputil: Move inline assembly macros to a separate header

6 years agonuv: Reuse the DSPContext from RTJpegContext
Diego Biurrun [Wed, 29 Jan 2014 17:04:55 +0000 (18:04 +0100)]
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.

6 years agofloat_dsp: Replace arch optimization ifdefs by if cascade
Diego Biurrun [Thu, 20 Mar 2014 13:16:25 +0000 (14:16 +0100)]
float_dsp: Replace arch optimization ifdefs by if cascade

Arch-specific optimizations are handled this way everywhere else.

6 years agoavcodec: more correct printf specifiers
Diego Biurrun [Thu, 13 Mar 2014 11:13:33 +0000 (12:13 +0100)]
avcodec: more correct printf specifiers

6 years agoAdditional icl inline asm fix.
Matt Oliver [Sat, 22 Mar 2014 04:59:12 +0000 (15:59 +1100)]
Additional icl inline asm fix.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: more correct printf format specifiers
Diego Biurrun [Wed, 12 Mar 2014 12:47:33 +0000 (13:47 +0100)]
avfilter: more correct printf format specifiers

6 years agolavc/libx264: add a warning when using qscale
James Darnley [Sat, 22 Mar 2014 08:48:52 +0000 (09:48 +0100)]
lavc/libx264: add a warning when using qscale

This addresses ticket #3238.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow: use distinct buffers per stream.
rogerdpack [Fri, 21 Mar 2014 22:27:01 +0000 (16:27 -0600)]
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>
6 years agoelbg: change utility_inc to 64bit
Michael Niedermayer [Sat, 22 Mar 2014 02:12:18 +0000 (03:12 +0100)]
elbg: change utility_inc to 64bit

Fixes integer overflow
Fixes Ticket3462

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mp3enc: use av_copy_packet()
Michael Niedermayer [Sat, 22 Mar 2014 00:26:48 +0000 (01:26 +0100)]
avformat/mp3enc: use av_copy_packet()

Fixes double free
Fixes Ticket3476

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowdec: also print qbias and mvscale in debug output
Michael Niedermayer [Fri, 21 Mar 2014 20:04:02 +0000 (21:04 +0100)]
avcodec/snowdec: also print qbias and mvscale in debug output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowdec: forward error codes
Michael Niedermayer [Fri, 21 Mar 2014 20:02:02 +0000 (21:02 +0100)]
avcodec/snowdec: forward error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowdec: return more specific error codes
Michael Niedermayer [Fri, 21 Mar 2014 20:01:34 +0000 (21:01 +0100)]
avcodec/snowdec: return more specific error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snowenc: simplify spatial_decomposition_count seting code
Michael Niedermayer [Fri, 21 Mar 2014 19:58:33 +0000 (20:58 +0100)]
avcodec/snowenc: simplify spatial_decomposition_count seting code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: never send 'Cookie: (null)' to the server
wm4 [Fri, 21 Mar 2014 17:51:30 +0000 (18:51 +0100)]
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>
6 years agoavcodec/snowenc: allow larger mb variances
Michael Niedermayer [Fri, 21 Mar 2014 17:29:16 +0000 (18:29 +0100)]
avcodec/snowenc: allow larger mb variances

Fixes assertion failure
Fixes Ticket3463

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit
Michael Niedermayer [Fri, 21 Mar 2014 17:25:36 +0000 (18:25 +0100)]
avcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit

This avoids hypothetical integer overflows

6 years agoavcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bit
Michael Niedermayer [Fri, 21 Mar 2014 17:24:56 +0000 (18:24 +0100)]
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>
6 years agoavcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit
Michael Niedermayer [Fri, 21 Mar 2014 17:12:58 +0000 (18:12 +0100)]
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>
6 years agoconfigure: Try to fix detection of ARM Compiler 5.04
Michael Niedermayer [Fri, 21 Mar 2014 16:51:16 +0000 (17:51 +0100)]
configure: Try to fix detection of ARM Compiler 5.04

Fixes Ticket 3364

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: dont call exit_program() from a signal hander
Michael Niedermayer [Fri, 21 Mar 2014 14:45:03 +0000 (15:45 +0100)]
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>
6 years agodoc/examples/avcodec: information regarding gop_size ignored if frame->pic-type is...
Anshul Maheshwari [Fri, 21 Mar 2014 10:29:52 +0000 (15:59 +0530)]
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>
6 years agoavcodec/x86/snowdsp: add missing clobbers to inner_add_yblock_bw_8_obmc_16_bh_even_ss...
Michael Niedermayer [Fri, 21 Mar 2014 02:20:56 +0000 (03:20 +0100)]
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>
6 years agoavcodec/snowdec: provide information about the wavelet with -debug 1
Michael Niedermayer [Fri, 21 Mar 2014 01:44:54 +0000 (02:44 +0100)]
avcodec/snowdec: provide information about the wavelet with -debug 1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Mar 2014 22:07:10 +0000 (23:07 +0100)]
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>
6 years agoMerge commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0'
Michael Niedermayer [Thu, 20 Mar 2014 21:47:29 +0000 (22:47 +0100)]
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>
6 years agoMerge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'
Michael Niedermayer [Thu, 20 Mar 2014 21:38:11 +0000 (22:38 +0100)]
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>
6 years agoMerge commit '82bb3048013201c0095d2853d4623633d912252f'
Michael Niedermayer [Thu, 20 Mar 2014 21:26:58 +0000 (22:26 +0100)]
Merge commit '82bb3048013201c0095d2853d4623633d912252f'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'
Michael Niedermayer [Thu, 20 Mar 2014 21:21:08 +0000 (22:21 +0100)]
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>
6 years agoMerge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'
Michael Niedermayer [Thu, 20 Mar 2014 21:12:06 +0000 (22:12 +0100)]
Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5169e688956be3378adb3b16a93962fe0048f1c9'
Michael Niedermayer [Thu, 20 Mar 2014 21:06:01 +0000 (22:06 +0100)]
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>
6 years agoMerge commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e'
Michael Niedermayer [Thu, 20 Mar 2014 20:58:16 +0000 (21:58 +0100)]
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>
6 years agoMerge commit '1675975216ecbea8e4826235f204dc0f4234383f'
Michael Niedermayer [Thu, 20 Mar 2014 20:50:54 +0000 (21:50 +0100)]
Merge commit '1675975216ecbea8e4826235f204dc0f4234383f'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b7d24fd4b2213104c001ed504074495568600b9c'
Michael Niedermayer [Thu, 20 Mar 2014 20:50:30 +0000 (21:50 +0100)]
Merge commit 'b7d24fd4b2213104c001ed504074495568600b9c'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b045283f2126637477a597f184638ebef09bf898'
Michael Niedermayer [Thu, 20 Mar 2014 20:44:51 +0000 (21:44 +0100)]
Merge commit 'b045283f2126637477a597f184638ebef09bf898'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8bd6f88266740068415f7da0628117f1b802efb9'
Michael Niedermayer [Thu, 20 Mar 2014 20:44:05 +0000 (21:44 +0100)]
Merge commit '8bd6f88266740068415f7da0628117f1b802efb9'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '022184a646896c6b27c6cca387039b030685266e'
Michael Niedermayer [Thu, 20 Mar 2014 20:30:21 +0000 (21:30 +0100)]
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>
6 years agoMerge commit '30f3f959879eee7890973e8cc9ce076450ced111'
Michael Niedermayer [Thu, 20 Mar 2014 20:29:31 +0000 (21:29 +0100)]
Merge commit '30f3f959879eee7890973e8cc9ce076450ced111'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1'
Michael Niedermayer [Thu, 20 Mar 2014 20:09:57 +0000 (21:09 +0100)]
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>
6 years agoMerge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'
Michael Niedermayer [Thu, 20 Mar 2014 20:08:30 +0000 (21:08 +0100)]
Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'

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

Conflicts:
libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'
Michael Niedermayer [Thu, 20 Mar 2014 19:52:19 +0000 (20:52 +0100)]
Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'

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

Conflicts:
libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2972087e398454122a82a970ed07924185175c6d'
Michael Niedermayer [Thu, 20 Mar 2014 19:50:00 +0000 (20:50 +0100)]
Merge commit '2972087e398454122a82a970ed07924185175c6d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224'
Michael Niedermayer [Thu, 20 Mar 2014 19:32:19 +0000 (20:32 +0100)]
Merge commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame
wm4 [Thu, 20 Mar 2014 07:53:18 +0000 (08:53 +0100)]
vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agovdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame
wm4 [Thu, 20 Mar 2014 07:53:17 +0000 (08:53 +0100)]
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>
6 years agovdpau: don't assume Picture and H264Picture are the same
wm4 [Thu, 20 Mar 2014 07:53:16 +0000 (08:53 +0100)]
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>
6 years agoffmpeg: try to avoid calling av_log() from sigterm_handler()
Michael Niedermayer [Thu, 20 Mar 2014 14:39:45 +0000 (15:39 +0100)]
ffmpeg: try to avoid calling av_log() from sigterm_handler()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix direct symbol ref support detection
Michael Niedermayer [Thu, 20 Mar 2014 12:14:33 +0000 (13:14 +0100)]
configure: fix direct symbol ref support detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil: Use correct type in me_cmp_func function pointer
Diego Biurrun [Fri, 20 Dec 2013 14:44:16 +0000 (15:44 +0100)]
dsputil: Use correct type in me_cmp_func function pointer

6 years agobuild: Group general components separate from de/encoders in arch Makefiles
Diego Biurrun [Fri, 20 Dec 2013 14:28:18 +0000 (15:28 +0100)]
build: Group general components separate from de/encoders in arch Makefiles

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

6 years agodsputil: Conditionally compile dsputil code on all architectures
Diego Biurrun [Fri, 20 Dec 2013 14:19:44 +0000 (15:19 +0100)]
dsputil: Conditionally compile dsputil code on all architectures

6 years agodsputil: Propagate bit depth information to all (sub)init functions
Diego Biurrun [Mon, 30 Dec 2013 11:09:03 +0000 (12:09 +0100)]
dsputil: Propagate bit depth information to all (sub)init functions

This avoids recalculating the value over and over again.

6 years agoarm: dsputil: K&R formatting cosmetics
Diego Biurrun [Thu, 30 Jan 2014 14:03:55 +0000 (06:03 -0800)]
arm: dsputil: K&R formatting cosmetics

6 years agoppc: dsputil: Drop trailing semicolon from macros
Diego Biurrun [Wed, 15 Jan 2014 18:54:17 +0000 (19:54 +0100)]
ppc: dsputil: Drop trailing semicolon from macros

This allows for a more natural macro usage.

6 years agoppc: dsputil: Merge some declarations and initializations
Diego Biurrun [Wed, 15 Jan 2014 13:36:28 +0000 (14:36 +0100)]
ppc: dsputil: Merge some declarations and initializations

6 years agoppc: dsputil: Simplify some ifdeffed function definitions
Diego Biurrun [Wed, 15 Jan 2014 11:17:20 +0000 (12:17 +0100)]
ppc: dsputil: Simplify some ifdeffed function definitions

6 years agoppc: dsputil: Drop some unnecessary parentheses
Diego Biurrun [Wed, 15 Jan 2014 11:14:20 +0000 (12:14 +0100)]
ppc: dsputil: Drop some unnecessary parentheses

6 years agoppc: dsputil: more K&R formatting cosmetics
Diego Biurrun [Wed, 15 Jan 2014 17:27:47 +0000 (18:27 +0100)]
ppc: dsputil: more K&R formatting cosmetics

6 years agoppc: dsputil: K&R formatting cosmetics
Diego Biurrun [Wed, 15 Jan 2014 11:07:55 +0000 (12:07 +0100)]
ppc: dsputil: K&R formatting cosmetics

6 years agoppc: dsputil: comment formatting and wording/grammar improvements
Diego Biurrun [Wed, 15 Jan 2014 10:24:43 +0000 (11:24 +0100)]
ppc: dsputil: comment formatting and wording/grammar improvements

6 years agohpeldsp_template: Merge some declarations and initializations
Diego Biurrun [Fri, 10 Jan 2014 13:41:47 +0000 (14:41 +0100)]
hpeldsp_template: Merge some declarations and initializations

6 years agohpeldsp_template: K&R formatting cosmetics
Diego Biurrun [Fri, 10 Jan 2014 13:26:35 +0000 (14:26 +0100)]
hpeldsp_template: K&R formatting cosmetics

6 years agohpel_template: Drop some unnecessary parentheses
Diego Biurrun [Fri, 10 Jan 2014 11:11:41 +0000 (12:11 +0100)]
hpel_template: Drop some unnecessary parentheses

6 years agohpel_template: K&R formatting cosmetics
Diego Biurrun [Fri, 10 Jan 2014 11:11:04 +0000 (12:11 +0100)]
hpel_template: K&R formatting cosmetics

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Mar 2014 11:53:20 +0000 (12:53 +0100)]
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>
6 years agofloat-dsp-test: do not use C99's predefined __func__
Janne Grunau [Tue, 18 Mar 2014 23:09:22 +0000 (00:09 +0100)]
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.

6 years agoswresample: add swri_resample_float_sse
James Almer [Thu, 20 Mar 2014 04:40:56 +0000 (01:40 -0300)]
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>
6 years agotruehd: tune VLC decoding for ARM.
Ben Avison [Wed, 19 Mar 2014 17:26:19 +0000 (17:26 +0000)]
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>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 19 Mar 2014 20:20:09 +0000 (21:20 +0100)]
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>
6 years agoMerge commit '606cc8afa1cb782311f68560c8f9bad978cdcc32'
Michael Niedermayer [Wed, 19 Mar 2014 20:14:27 +0000 (21:14 +0100)]
Merge commit '606cc8afa1cb782311f68560c8f9bad978cdcc32'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004'
Michael Niedermayer [Wed, 19 Mar 2014 20:09:16 +0000 (21:09 +0100)]
Merge commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004'

* commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004':
  mxf: Lowercase UL strings

Conflicts:
libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5'
Michael Niedermayer [Wed, 19 Mar 2014 19:54:12 +0000 (20:54 +0100)]
Merge commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5'

* commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5':
  mxf: Verbose debug logging

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '842ea36c747eb6537c4236114346cb7a3e9a8df1'
Michael Niedermayer [Wed, 19 Mar 2014 19:46:08 +0000 (20:46 +0100)]
Merge commit '842ea36c747eb6537c4236114346cb7a3e9a8df1'

* commit '842ea36c747eb6537c4236114346cb7a3e9a8df1':
  mxf: Override faulty PreviousPartition entries

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