]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 18 Feb 2015 00:37:06 +0000 (01:37 +0100)]
avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 00:34:50 +0000 (01:34 +0100)]
avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Supraja Meedinti [Tue, 17 Feb 2015 19:18:53 +0000 (00:48 +0530)]
libavutil: optimize twofish cipher
before:
lavu TWOFISH size:
1048576 runs: 1024 time: 90.052 +- 4.630
after:
lavu TWOFISH size:
1048576 runs: 1024 time: 18.085 +- 0.241
gcrypt TWOFISH size:
1048576 runs: 1024 time: 25.666 +- 0.307
tomcrypt TWOFISH size:
1048576 runs: 1024 time: 18.428 +- 0.363
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:50:56 +0000 (23:50 +0100)]
Merge commit '
195942ed9b9b563ec86d34b73aa2c1ee8715d59d '
* commit '
195942ed9b9b563ec86d34b73aa2c1ee8715d59d ':
riff: Support QT RLE Animation in avi ('rle ' FourCC)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:42:26 +0000 (23:42 +0100)]
Merge commit '
c78dc12118cb5b2a69a17f38c69f77a42e89a9c4 '
* commit '
c78dc12118cb5b2a69a17f38c69f77a42e89a9c4 ':
riff: Support ProRes in avi (APCH fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:34:36 +0000 (23:34 +0100)]
Merge commit '
42c8f92e2fa390fa17b03d37b4323ec0d721d4cd '
* commit '
42c8f92e2fa390fa17b03d37b4323ec0d721d4cd ':
wmv2: Return meaningful error codes
Conflicts:
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:26:28 +0000 (23:26 +0100)]
Merge commit '
f3e045263e445c4ab54d85ecae359494cd96a3e2 '
* commit '
f3e045263e445c4ab54d85ecae359494cd96a3e2 ':
qdm2: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:12:29 +0000 (23:12 +0100)]
Merge commit '
a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012 '
* commit '
a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012 ':
libxvid: Return meaningful error messages
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
See:
2a89afb376aebe833bee0b5958cec16c48936b03 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:58:31 +0000 (22:58 +0100)]
avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure
This keeps the fields consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:54:56 +0000 (22:54 +0100)]
Merge commit '
18f4fa251b0eb36392839f5bf6180f280dc04d8d '
* commit '
18f4fa251b0eb36392839f5bf6180f280dc04d8d ':
aac_adtstoasc_bsf: Check extradata memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:46:59 +0000 (22:46 +0100)]
Merge commit '
fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc '
* commit '
fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc ':
avpacket: Check buffer reference
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:39:32 +0000 (22:39 +0100)]
Merge commit '
31dc73e92a96f08d07650c0e7d31c0b9a1465d46 '
* commit '
31dc73e92a96f08d07650c0e7d31c0b9a1465d46 ':
vorbisdec: Check memory allocations
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:30:58 +0000 (22:30 +0100)]
Merge commit '
ec17782e17de1e8501ca213e276dfe5412ff1d11 '
* commit '
ec17782e17de1e8501ca213e276dfe5412ff1d11 ':
dvdsubdec: Check memory allocations
Conflicts:
libavcodec/dvdsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:21:22 +0000 (22:21 +0100)]
Merge commit '
e51f22122d23589e93ac4f0b3e570bb925755915 '
* commit '
e51f22122d23589e93ac4f0b3e570bb925755915 ':
swscale: Check memory allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:08:46 +0000 (22:08 +0100)]
Michael Niedermayer [Tue, 17 Feb 2015 20:51:35 +0000 (21:51 +0100)]
avformat/movenc: Fix stts_entries allocation check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:50:08 +0000 (21:50 +0100)]
Merge commit '
a8765852158ecb2ae34895fa35ff51dc95c186f9 '
* commit '
a8765852158ecb2ae34895fa35ff51dc95c186f9 ':
movenc: Check memory allocations
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:42:08 +0000 (21:42 +0100)]
Merge commit '
da7e31a240f276836a0b90ca6c0714181b353cc4 '
* commit '
da7e31a240f276836a0b90ca6c0714181b353cc4 ':
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:35:13 +0000 (21:35 +0100)]
Merge commit '
d89e58f53939d91a88aa7042c94d9d1cd364da52 '
* commit '
d89e58f53939d91a88aa7042c94d9d1cd364da52 ':
dct-test: Fix initialization syntax
See:
392b4b663c450f5522f7c1442da91f7647db6bf0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:26:00 +0000 (21:26 +0100)]
Merge commit '
bb7701684c7170dfd5f33a3c7d827265844619f2 '
* commit '
bb7701684c7170dfd5f33a3c7d827265844619f2 ':
lavf: Document the codec context initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:25:07 +0000 (21:25 +0100)]
Merge commit '
cb70a93ca1e7fae1b5dfb65ad149d311a65206a4 '
* commit '
cb70a93ca1e7fae1b5dfb65ad149d311a65206a4 ':
lavc: Document interaction between avcodec_open2() and decoding routines
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:16:22 +0000 (21:16 +0100)]
Merge commit '
733f4b05f0e120ddd0393b23f2b6d9106cf922e4 '
* commit '
733f4b05f0e120ddd0393b23f2b6d9106cf922e4 ':
avplay: Check format allocation inside decode_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:08:33 +0000 (21:08 +0100)]
Merge commit '
266f241193b2fa8c99bb8b1f007c66bedd3b7d97 '
* commit '
266f241193b2fa8c99bb8b1f007c66bedd3b7d97 ':
avplay: Check frame allocation inside video_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:00:04 +0000 (21:00 +0100)]
Merge commit '
81688e68f93f3142e2093f1a3d226edaeb179992 '
* commit '
81688e68f93f3142e2093f1a3d226edaeb179992 ':
avconv: Check rc_override memory allocation
Conflicts:
ffmpeg_opt.c
See:
7efabffc2899b76688a40b4bd7c63370eb2d8ca8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 19:48:05 +0000 (20:48 +0100)]
Merge commit '
9d3b752fceb0f2a42cac7c2a1109b0629823c99f '
* commit '
9d3b752fceb0f2a42cac7c2a1109b0629823c99f ':
graphparser: Check av_get_token() memory error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 19:40:00 +0000 (20:40 +0100)]
avformat/matroskaenc: Use the correct data type for the chapter times
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 19:25:47 +0000 (20:25 +0100)]
Merge commit '
5dc47a2bd52e375ed742c45d08356b45098f458d '
* commit '
5dc47a2bd52e375ed742c45d08356b45098f458d ':
matroskaenc: Validate chapter start and end times
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 19:18:19 +0000 (20:18 +0100)]
Merge commit '
f8c1719771dc4ac2e13e6bc8bf741854a30e3a86 '
* commit '
f8c1719771dc4ac2e13e6bc8bf741854a30e3a86 ':
dca: Remove separate header for DCA ExSS
Conflicts:
libavcodec/dca.h
libavcodec/dca_exss.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 17:57:26 +0000 (18:57 +0100)]
avcodec/vp56: Add () to protect TRANSPOSE()s arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Thu, 12 Feb 2015 16:04:58 +0000 (11:04 -0500)]
riff: Support QT RLE Animation in avi ('rle ' FourCC)
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Tue, 10 Feb 2015 19:33:24 +0000 (14:33 -0500)]
riff: Support ProRes in avi (APCH fourcc)
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Himangi Saraogi [Sun, 15 Feb 2015 23:41:08 +0000 (05:11 +0530)]
wmv2: Return meaningful error codes
Himangi Saraogi [Sun, 15 Feb 2015 23:58:45 +0000 (05:28 +0530)]
qdm2: Return meaningful error codes
Himangi Saraogi [Tue, 10 Feb 2015 18:57:35 +0000 (00:27 +0530)]
libxvid: Return meaningful error messages
Himangi Saraogi [Tue, 10 Feb 2015 22:07:40 +0000 (03:37 +0530)]
aac_adtstoasc_bsf: Check extradata memory allocation
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Mon, 2 Feb 2015 19:53:51 +0000 (20:53 +0100)]
avpacket: Check buffer reference
CC: libav-stable@libav.org
Bug-Id: CID
1267889
Vittorio Giovara [Mon, 2 Feb 2015 00:57:15 +0000 (01:57 +0100)]
vorbisdec: Check memory allocations
Vittorio Giovara [Mon, 2 Feb 2015 00:57:14 +0000 (01:57 +0100)]
dvdsubdec: Check memory allocations
Federico Tomassetti [Sun, 15 Feb 2015 19:44:51 +0000 (19:44 +0000)]
swscale: Check memory allocations
CC: libav-stable@libav.org
Bug-Id: CID
1267888 / CID
1267890
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Hugo Beauzée-Luyssen [Sun, 1 Feb 2015 18:19:47 +0000 (19:19 +0100)]
nutdec: Check memory allocations
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Hugo Beauzée-Luyssen [Sun, 1 Feb 2015 18:19:45 +0000 (19:19 +0100)]
movenc: Check memory allocations
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Hugo Beauzée-Luyssen [Sun, 1 Feb 2015 18:19:46 +0000 (19:19 +0100)]
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Bug-Id: CID
1257835
Vittorio Giovara [Fri, 6 Feb 2015 18:38:44 +0000 (18:38 +0000)]
dct-test: Fix initialization syntax
Related to "warning: suggest braces around initialization of subobject".
Vittorio Giovara [Thu, 4 Dec 2014 19:09:40 +0000 (19:09 +0000)]
lavf: Document the codec context initialization
During remuxing avcodec_copy_context() is discouraged as certain fields
(such as codec_tag) could reflect invalid values between input and
output contextes.
Vittorio Giovara [Thu, 4 Dec 2014 19:56:38 +0000 (19:56 +0000)]
lavc: Document interaction between avcodec_open2() and decoding routines
Vittorio Giovara [Wed, 4 Feb 2015 14:21:01 +0000 (14:21 +0000)]
avplay: Check format allocation inside decode_thread()
CC: libav-stable@libav.org
Bug-Id: CID
1265718
Vittorio Giovara [Wed, 4 Feb 2015 14:20:59 +0000 (14:20 +0000)]
avplay: Check frame allocation inside video_thread()
CC: libav-stable@libav.org
Bug-Id: CID
1267893
Vittorio Giovara [Wed, 4 Feb 2015 14:21:00 +0000 (14:21 +0000)]
avconv: Check rc_override memory allocation
CC: libav-stable@libav.org
Bug-Id: CID
1265719
Vittorio Giovara [Wed, 4 Feb 2015 14:20:58 +0000 (14:20 +0000)]
graphparser: Check av_get_token() memory error
CC: libav-stable@libav.org
Bug-Id: CID
1267891
Vittorio Giovara [Tue, 3 Feb 2015 15:40:34 +0000 (15:40 +0000)]
matroskaenc: Validate chapter start and end times
CC: libav-stable@libav.org
Bug-Id: CID
1265717
Clément Bœsch [Tue, 17 Feb 2015 16:15:00 +0000 (17:15 +0100)]
avfilter/paletteuse: raise cache size from 64k to 512k
(or 32k to 256k in 32-bit)
Christophe Gisquet [Mon, 16 Feb 2015 19:12:04 +0000 (20:12 +0100)]
x86: hevc_mc: fewer xmm regs used in epel h/v
11 xmm regs seem only required for avx2.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 17 Feb 2015 10:39:09 +0000 (11:39 +0100)]
Force linking against user32 if dxva2 is enabled.
Fixes compilation with vfwcap disabled.
Reported and tested by Bernhard Döbler, programmer bardware de
Reviewed-by: Matt Oliver
Christophe Gisquet [Sun, 8 Feb 2015 11:18:27 +0000 (12:18 +0100)]
x86/doc/Makefile: DBG=1 to preprocess external asm
The macro hell sometimes make it difficult to trace the source of
an error, so it is easier to analyze the preprocessed output.
This patch makes this automatical by specifying DBG=1 on the
command line: a file ffmpeg/dir/file.asm gets preprocessed to
builddir/dir/file.dbg.asm, which is then compiled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 3 Feb 2015 19:40:41 +0000 (20:40 +0100)]
x86inc: Correctly warn on use of SSE2 instructions in SSE functions
SSE2 instructions that are XMM-implementations of pre-existing MMX/MMX2
instructions did not issue warnings when used in SSE functions. Handle
it by also checking the register type when such instructions are used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:49:32 +0000 (00:49 +0100)]
avfilter/vf_fieldmatch: Add () to protect the arguments of the HAS_FF_AROUND() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:47:47 +0000 (00:47 +0100)]
avfilter/vf_phase: Add () to protect DIFF()s arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:36:35 +0000 (00:36 +0100)]
swresample/resample_template: Add () to protect the arguments of the OUT() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:22:42 +0000 (00:22 +0100)]
avutil/aes: Add () to protect the ROT() arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:21:48 +0000 (00:21 +0100)]
avutil/attributes: Add () to protect the AV_GCC_VERSION_AT_LEAST() arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:20:30 +0000 (00:20 +0100)]
avutil/intmath: Add () to protect the ff_log2() argument
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:18:01 +0000 (00:18 +0100)]
avutil/murmur3: Add () to protect the ROT() arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:17:21 +0000 (00:17 +0100)]
avutil/version: Add () to protect the AV_VERSION_INT() arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:05:51 +0000 (00:05 +0100)]
avformat/tedcaptionsdec: add () to protect the argument of ERR_CODE()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:04:22 +0000 (00:04 +0100)]
avutil/log: add () to protect the argument of AV_LOG_C()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 23:02:40 +0000 (00:02 +0100)]
avcodec/vc1dsp: add () to protect the arguments of the op* macros
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 22:59:39 +0000 (23:59 +0100)]
avcodec/ac3: add () to protect the macro arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 22:14:27 +0000 (23:14 +0100)]
avformat/mpc8: Add () to protect MKMPCTAG()s arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 22:13:00 +0000 (23:13 +0100)]
avcodec/me_cmp: add () to protect avg*s arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 21:56:09 +0000 (22:56 +0100)]
avcodec/bmvvideo: Add () to protect NEXT_BYTE() argument
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 21:55:17 +0000 (22:55 +0100)]
swresample/swresample-test: Add () to protect uint_rand() argument
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 21:53:28 +0000 (22:53 +0100)]
avformat/tls: add () to protect macro arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 16 Feb 2015 21:53:38 +0000 (18:53 -0300)]
avcodec/hevcdsp: add missing () to CMP macro
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: James Almer <jamrial@gmail.com>
Christophe Gisquet [Sat, 7 Feb 2015 18:49:38 +0000 (18:49 +0000)]
x86: hevc_mc: save 1 gpr in epel filter loading
The 3*stride value stored in r3src can be loaded much later,
so use r3src instead of a dedicated gpr when possible.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 16 Feb 2015 19:53:31 +0000 (16:53 -0300)]
avcodec/hevcdsp: optimize pixel comparison in sao_edge_filter
GCC 4.9.2 on a Core i5-4200U @ 1.60GHz, Linux x86_64
Before
715487 decicycles in sao_edge_filter_8, 262144 runs, 0 skips
After
672104 decicycles in sao_edge_filter_8, 262144 runs, 0 skips
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
wm4 [Mon, 16 Feb 2015 18:31:42 +0000 (19:31 +0100)]
hls: fix a null pointer dereference
Not allocating the pls->ctx will crash in libavformat/hls.c:1410, where
it tries to dereference the field.
Sample: http://ec24.rtp.pt/liverepeater/rtpn.smil/playlist.m3u8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Mon, 16 Feb 2015 16:38:53 +0000 (00:38 +0800)]
avcodec/vc1_mc: factor out helper functions for scaling blocks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kevin Wheatley [Mon, 16 Feb 2015 17:05:28 +0000 (17:05 +0000)]
avformat/rtpdec_h264: fix compile failure with -DDEBUG
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 16 Feb 2015 16:23:34 +0000 (17:23 +0100)]
avcodec/gif: fix off by one in column offsetting finding
Seppo Tomperi [Mon, 16 Feb 2015 11:13:30 +0000 (13:13 +0200)]
hevcdsp: HEVC deblocking ARM NEON register clobber fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
zhaoxiu.zeng [Sat, 14 Feb 2015 15:14:47 +0000 (23:14 +0800)]
avcodec/vc1_mc: move median4() to mathops.h
Needed for architecture specific optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 16 Feb 2015 09:43:07 +0000 (10:43 +0100)]
dca: Remove separate header for DCA ExSS
There is no point in having a separate header for a single declaration.
James Almer [Mon, 16 Feb 2015 02:16:25 +0000 (23:16 -0300)]
x86/g722dsp: add ff_g722_apply_qmf_sse2
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 16 Feb 2015 01:56:17 +0000 (02:56 +0100)]
Merge commit '
81ef46020fa654720e3beb4f5551ba634fae262a '
* commit '
81ef46020fa654720e3beb4f5551ba634fae262a ':
bktr: Use av_strerror and propagate error codes
Conflicts:
libavdevice/bktr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 01:40:26 +0000 (02:40 +0100)]
Merge commit '
3a651f599a18b023602370b67a77eb0efa309b20 '
* commit '
3a651f599a18b023602370b67a77eb0efa309b20 ':
dca: Move data tables from a header to an object file
Conflicts:
libavcodec/Makefile
libavcodec/dcadata.h
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 01:29:41 +0000 (02:29 +0100)]
Merge commit '
65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda '
* commit '
65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda ':
dca: Add array sizes to array declarations
Conflicts:
libavcodec/dcadata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 01:16:29 +0000 (02:16 +0100)]
Merge commit '
702458538d4e52809bcef460d39baabf061b16b5 '
* commit '
702458538d4e52809bcef460d39baabf061b16b5 ':
g722: Add ARM NEON implementation for g722_apply_qmf()
Conflicts:
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 01:07:39 +0000 (02:07 +0100)]
Merge commit '
73ae0a9d12857852222363f9a7c14d07058ebfd3 '
* commit '
73ae0a9d12857852222363f9a7c14d07058ebfd3 ':
g722: Split out computation of band->s_zero and unroll code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 01:00:49 +0000 (02:00 +0100)]
Merge commit '
b16057b5fe9f02442c52388037891c2e381205fc '
* commit '
b16057b5fe9f02442c52388037891c2e381205fc ':
g722: Unroll g722_apply_qmf()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 00:54:14 +0000 (01:54 +0100)]
Merge commit '
10f160768b824f00933f33bc69f1fae89a25dfc8 '
* commit '
10f160768b824f00933f33bc69f1fae89a25dfc8 ':
g722: Reduce number of pointers passed to g722_apply_qmf() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 00:45:50 +0000 (01:45 +0100)]
Merge commit '
67690683130faf37dd9d969ced15eba2a1940ade '
* commit '
67690683130faf37dd9d969ced15eba2a1940ade ':
g722: Split out g722_qmf_apply() function into g722dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 16 Feb 2015 00:28:08 +0000 (01:28 +0100)]
avformat/mov: Bypass av_add_index_entry()
The new mov code uses a temporally non sorted index since
4abfa387b8234736f6e0e541951e3d5eb60eb843
and can thus no longer be filled with av_add_index_entry() which expects the index to be sorted.
Reverting
4abfa387b8234736f6e0e541951e3d5eb60eb843 and this commit would be
a alternative fix as would be various other options.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 15 Feb 2015 23:27:04 +0000 (00:27 +0100)]
Merge commit '
4abfa387b8234736f6e0e541951e3d5eb60eb843 '
* commit '
4abfa387b8234736f6e0e541951e3d5eb60eb843 ':
mov: Change DTS-based seek into CTS-based seek.
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Himangi Saraogi [Tue, 10 Feb 2015 14:06:51 +0000 (19:36 +0530)]
bktr: Use av_strerror and propagate error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Sun, 15 Feb 2015 19:03:03 +0000 (20:03 +0100)]
dca: Move data tables from a header to an object file
This allows sharing them with the DCA XLL extension w/o duplication.
Diego Biurrun [Sun, 15 Feb 2015 19:03:02 +0000 (20:03 +0100)]
dca: Add array sizes to array declarations
Michael Niedermayer [Sun, 15 Feb 2015 20:49:57 +0000 (21:49 +0100)]
Merge commit '
51ca3cb604a7585a7cff35d4b954794508955c19 '
* commit '
51ca3cb604a7585a7cff35d4b954794508955c19 ':
xcbgrab: Use the correct geometry for the region highlight
See:
0ae37e460c345a4c76e28256af56931e00c94cb5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Peter Meerwald [Sun, 15 Feb 2015 11:21:25 +0000 (12:21 +0100)]
g722: Add ARM NEON implementation for g722_apply_qmf()
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
Peter Meerwald [Sun, 15 Feb 2015 11:21:24 +0000 (12:21 +0100)]
g722: Split out computation of band->s_zero and unroll code
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
Peter Meerwald [Sun, 15 Feb 2015 11:21:23 +0000 (12:21 +0100)]
g722: Unroll g722_apply_qmf()
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>