]>
git.sesse.net Git - ffmpeg/log
Nicolas George [Sun, 23 Mar 2014 18:17:20 +0000 (19:17 +0100)]
lavu: add myself as dynarray.h maintainer.
Nicolas George [Sun, 2 Mar 2014 19:59:32 +0000 (20:59 +0100)]
ffmpeg: sub2video: send a last blank frame before closing.
Fix trac ticket #3420.
Nicolas George [Sun, 2 Mar 2014 14:17:47 +0000 (15:17 +0100)]
tools: add dvd2concat.
Nicolas George [Wed, 26 Feb 2014 19:22:46 +0000 (20:22 +0100)]
lavf/concatdec: allow to match streams by id.
That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order.
Carl Eugen Hoyos [Sun, 23 Mar 2014 16:57:32 +0000 (17:57 +0100)]
Always pass the configure option sysroot to --sysroot and -isysroot.
On darwin, --sysroot may be ignored.
Carl Eugen Hoyos [Sun, 23 Mar 2014 12:24:07 +0000 (13:24 +0100)]
Autodetect VDA like all other hardware acccelerations.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 14:03:50 +0000 (15:03 +0100)]
avcodec/x86/h264_qpel: Fix typo introduced by
322a1dda973e802db7b57f2007fad3efcd5bab81
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 12:25:42 +0000 (13:25 +0100)]
Move avpriv_find_pix_fmt() to utils.c
Fixes build with --disable-everything
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Fri, 21 Mar 2014 17:51:31 +0000 (18:51 +0100)]
http: restructure http_connect error handling path
The authstr memory allocations make it annoying to error in the middle
of the header setup code, so apply the usual C error handling idiom to
make it easier to error at any point.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 02:56:43 +0000 (03:56 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: drop ff_pixfmt_list_420
Conflicts:
libavcodec/flvdec.c
libavcodec/msmpeg4dec.c
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 02:46:16 +0000 (03:46 +0100)]
Merge commit '
d5717bc4e9cc253a933ae8130eea3a9c8bc33c0b '
* commit '
d5717bc4e9cc253a933ae8130eea3a9c8bc33c0b ':
changelog: switch libx265 and compand entries
Conflicts:
Changelog
Not many changes as libx265 and compand are placed correctly for us
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 02:32:00 +0000 (03:32 +0100)]
Merge commit '
0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1 '
* commit '
0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1 ':
configure: Always use -DOPJ_STATIC when checking for openjpeg
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 23 Mar 2014 02:22:20 +0000 (03:22 +0100)]
Merge commit '
1e9db41e2a2166be5671b088ef4ad06a40af459f '
* commit '
1e9db41e2a2166be5671b088ef4ad06a40af459f ':
movenc: Allow override of major brand in ftyp atom
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 17 Mar 2014 17:03:47 +0000 (18:03 +0100)]
lavc: drop ff_pixfmt_list_420
Vittorio Giovara [Fri, 21 Mar 2014 01:14:26 +0000 (02:14 +0100)]
changelog: switch libx265 and compand entries
Luca Barbato [Sat, 22 Mar 2014 19:16:44 +0000 (20:16 +0100)]
configure: Always use -DOPJ_STATIC when checking for openjpeg
Unbreaks windows systems not providing pkgconf files.
Reported-By: Rafaël Carré <funman@videolan.org>
John Stebbins [Tue, 18 Mar 2014 13:11:00 +0000 (13:11 +0000)]
movenc: Allow override of major brand in ftyp atom
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Michael Niedermayer [Mon, 17 Mar 2014 23:08:54 +0000 (00:08 +0100)]
avcodec: Add padding after the remaining AVFrames
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>
Michael Niedermayer [Sat, 22 Mar 2014 22:50:45 +0000 (23:50 +0100)]
Merge remote-tracking branch 'cus/stable'
* 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>
Michael Niedermayer [Sat, 22 Mar 2014 22:44:28 +0000 (23:44 +0100)]
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Diego Biurrun [Sat, 22 Mar 2014 17:36:33 +0000 (18:36 +0100)]
lagarith: Fix typo in printf format string
libavcodec/lagarith.c:671:16: warning: '#' flag used with ‘%u’ gnu_printf format [-Wformat]
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>
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>
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>
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>
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>
Diego Biurrun [Sat, 21 Dec 2013 15:03:59 +0000 (16:03 +0100)]
dsputil: Move thirdpel-related bits into their own context
Diego Biurrun [Wed, 29 Jan 2014 13:57:10 +0000 (14:57 +0100)]
x86: 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
Diego Biurrun [Tue, 28 Jan 2014 17:19:21 +0000 (18:19 +0100)]
x86: dsputil: Move fpel declarations to a separate header
Diego Biurrun [Sat, 21 Dec 2013 16:33:17 +0000 (17:33 +0100)]
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
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
Diego Biurrun [Mon, 27 Jan 2014 13:27:04 +0000 (14:27 +0100)]
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
Diego Biurrun [Mon, 27 Jan 2014 14:06:54 +0000 (15:06 +0100)]
x86: dsputil: Move inline assembly macros to a separate header
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.
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.
Diego Biurrun [Thu, 13 Mar 2014 11:13:33 +0000 (12:13 +0100)]
avcodec: more correct printf specifiers
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>
Marton Balint [Sun, 2 Mar 2014 14:20:43 +0000 (15:20 +0100)]
mpegts: fix teletext pts of streams with standalone pcr pid
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 2 Mar 2014 00:47:17 +0000 (01:47 +0100)]
mpegts: add pcr filter for tracking standalone pcr pids
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 2 Mar 2014 13:28:06 +0000 (14:28 +0100)]
mpegts: factorize mpegts filter creator code
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 2 Mar 2014 13:12:50 +0000 (14:12 +0100)]
mpegts: move last_pcr to MpegTSFilter level
Signed-off-by: Marton Balint <cus@passwd.hu>
Diego Biurrun [Wed, 12 Mar 2014 12:47:33 +0000 (13:47 +0100)]
avfilter: more correct printf format specifiers
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>