Michael Niedermayer
704c980294
avcodec/aacenc: Fix sample rate check
...
Fixes out of array read
Fixes CID1257803, CID1257797, CID1257789, CID1257786
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 22:29:09 +01:00
Michael Niedermayer
a6baef6517
avcodec/mpegvideo: Fix memleak of mvs
...
Fixes CID1271053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 22:18:26 +01:00
Michael Niedermayer
2234a1cd16
avcodec/vorbisdec: Fix memleak, call cleanup on memory allocation failure
...
Fixes CID1258478, CID1258476, CID1258475
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 21:27:09 +01:00
Michael Niedermayer
8559a71415
avcodec/wmaenc: Check extradata allocations
...
Fixes CID1257842
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 21:23:39 +01:00
Christophe Gisquet
e0c7ba40cf
takdec: pad filter coeff buffer for DSP functions
...
Currently, a part of the loop has to be handled in plain C, because of DSP
function requirements of having batches of 16 elements to process.
Instead, pad the buffer with 0 where the DSP functions are overreading.
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-22 16:35:32 -03:00
Paul B Mahol
586ba24ff2
avcodec/exr: fix memset first arg in reverse_lut()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-22 17:30:50 +00:00
Michael Niedermayer
642c49c983
avcodec/libaacplus: Check for av_malloc() failure
...
Fixes CID1271046
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 14:00:53 +01:00
Michael Niedermayer
48214956b2
avcodec/jpeglsenc: Check for memory allocation failures
...
Fixes CID1271044
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 13:45:19 +01:00
Michael Niedermayer
066dc04373
avcodec/libx264: Check for av_malloc() failure
...
Fixes CID1257813
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 02:55:51 +01:00
Michael Niedermayer
21518f5a0a
avcodec/libvpxenc: Check for av_malloc() failure
...
Fixes CID1271045
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 02:40:16 +01:00
Michael Niedermayer
67d4d5f5db
avcodec/libtheoraenc: Check for av_fast_realloc() failure
...
Fixes CID1257799
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 02:18:35 +01:00
Michael Niedermayer
27216bf314
avcodec/libtheoraenc: Check for stats allocation failure
...
Fixes CID1257785
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 02:11:27 +01:00
Michael Niedermayer
dedbefee60
Merge commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a'
...
* commit '5cbae5651d7c1ce9b0691dfbf2d474cb2b0ebb9a':
mpegaudio_parser: add MP3 ADU headers parser
Conflicts:
libavcodec/mpegaudio_parser.c
libavcodec/mpegaudiodecheader.c
libavcodec/version.h
See: 8ca098f444
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 01:08:28 +01:00
Gilles Chanteperdrix
5cbae5651d
mpegaudio_parser: add MP3 ADU headers parser
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 23:37:42 +02:00
Michael Niedermayer
f848a66009
avcodec/adpcm: use av_clip_intp2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 20:41:36 +01:00
Michael Niedermayer
d1c705087f
avcodec/hevc_mvs: Use av_clip_intp2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 20:40:17 +01:00
Michael Niedermayer
d74c8d3ada
avcodec/adxenc: Use av_clip_intp2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 20:38:13 +01:00
Michael Niedermayer
03f39fbb2a
avcodec/x86/mlpdsp_init: Simplify mlp_filter_channel_x86()
...
Based on patch by Francisco Blas Izquierdo Riera
Commit message partly taken from carl
fixes a compilation
error in mlpdsp_init.c with -fstack-check and some gcc compilers (I
reproduced the issue with gcc 4.7.3) by simplifying the code.
See also https://bugs.gentoo.org/show_bug.cgi?id=471756
$ make libavcodec/x86/mlpdsp_init.o
libavcodec/x86/mlpdsp_init.c: In function ‘mlp_filter_channel_x86’:
libavcodec/x86/mlpdsp_init.c:142:5: error: can’t find a register in
class ‘GENERAL_REGS’ while reloading ‘asm’
libavcodec/x86/mlpdsp_init.c:142:5: error: ‘asm’ operand has impossible
constraints
4551 -> 4509 dezicycles
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 16:05:41 +01:00
Michael Niedermayer
fbae0ac3e4
avcodec/ffv1enc: Use av_clip_uint8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 15:50:19 +01:00
Michael Niedermayer
114a2eb272
avcodec: Use av_clip_uintp2() where possible
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 15:50:03 +01:00
Michael Niedermayer
d301a13427
avcodec/snowenc: Use av_clip_uint8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 15:44:34 +01:00
Michael Niedermayer
4b55a7e1ce
Merge commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5'
...
* commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5':
h264: initialize H264Context.avctx in init_thread_copy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 11:53:00 +01:00
Michael Niedermayer
6458e4750f
Merge commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40'
...
* commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40':
h264: only ref cur_pic in update_thread_context if it is initialized
Conflicts:
libavcodec/h264_slice.c
See: 0fc01ae33c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 11:45:42 +01:00
Michael Niedermayer
66d79aa2e1
Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'
...
* commit '9abc80f1ed673141326341e26a05c3e1f78576d0':
libavcodec: Make use of av_clip functions
Conflicts:
libavcodec/takdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 11:27:24 +01:00
Anton Khirnov
a06b0b1295
h264: initialize H264Context.avctx in init_thread_copy
...
This prevents using a wrong (first thread's) AVCodecContext if decoding
a frame in the first pass over all threads fails.
2015-02-21 09:29:48 +01:00
Anton Khirnov
0dea4c77cc
h264: only ref cur_pic in update_thread_context if it is initialized
...
It may be empty if the previous thread's decode call did not contain a
valid frame.
2015-02-21 09:29:27 +01:00
Peter Meerwald
9abc80f1ed
libavcodec: Make use of av_clip functions
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-21 00:54:40 +01:00
Michael Niedermayer
0a1146a59a
Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'
...
* commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b':
libavcodec: Don't use av_cold annotation in twinvq header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 22:24:43 +01:00
Peter Meerwald
b8d18a9437
libavcodec: Don't use av_cold annotation in twinvq header file
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20 19:32:37 +02:00
Michael Niedermayer
588361dd26
avcodec/dca: move remaining tables to dcadata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 11:11:33 +01:00
Michael Niedermayer
6c91afe497
avcodec/snowdec: Fix avmv_index increment
...
Fixes reading uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 03:31:14 +01:00
Michael Niedermayer
b11edbd289
avcodec/dss_sp: Avoid a slow division and modulo in the pitch_lag calculation
...
Also check the combined_pitch for validity (which is needed to keep the behavior
identical in the error case)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 22:53:35 +01:00
Michael Niedermayer
31fb029f2d
avcodec/dss_sp: de-obfuscate index inversion
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 22:41:41 +01:00
Michael Niedermayer
4f1c1b26f2
avcodec/dss_sp: Protect DSS_SP_FORMULA() with a set of outside brackets
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 22:29:02 +01:00
Michael Niedermayer
dfe5a9f022
Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
...
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
lavc: Add DSS SP decoder
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 21:31:26 +01:00
Michael Niedermayer
99bcfe6227
Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'
...
* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
qsv_api: fix building with libmfx disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 21:12:33 +01:00
Michael Niedermayer
841e9f431c
Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'
...
* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
lavc: add an Intel libmfx-based H.264 decoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 21:12:04 +01:00
Michael Niedermayer
560eb7179a
Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'
...
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49':
h264_parser: export video format and dimensions
Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 20:39:04 +01:00
Oleksij Rempel
c56b9b1eb2
lavc: Add DSS SP decoder
...
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-19 12:05:19 -05:00
Anton Khirnov
0fbb271318
qsv_api: fix building with libmfx disabled
2015-02-19 17:35:34 +01:00
Anton Khirnov
4e08c82110
lavc: add an Intel libmfx-based H.264 decoder
...
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.
2015-02-19 15:08:49 +01:00
Anton Khirnov
31d2039cb4
h264_parser: export video format and dimensions
2015-02-19 15:07:52 +01:00
Michael Niedermayer
c1ff2cdbca
Merge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'
...
* commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5':
rv40: Return more meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 10:54:07 +01:00
Himangi Saraogi
0f532fd3f9
rv40: Return more meaningful error codes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-02-19 08:39:29 +01:00
Michael Niedermayer
f144e4ddff
avcodec/wmalosslessdec: use sizeof() instead of a literal number
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 03:14:50 +01:00
Derek Buitenhuis
8b96e8dd28
libx265: Add crf private option
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-02-18 10:21:56 -05:00
Derek Buitenhuis
b920db6731
libx265: Reduce the scope of some variables
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-02-18 10:21:54 -05:00
Derek Buitenhuis
d617e77cec
libx265: Add crf private option
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-02-18 10:18:12 -05:00
Derek Buitenhuis
2de887e45b
libx265: Reduce the scope of some variables
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-02-18 10:16:50 -05:00
Michael Niedermayer
424ed1a83e
avcodec/faxcompr: Fix memleak
...
Fixes CID1270816
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-18 11:38:00 +01:00
Paul B Mahol
956bd71eeb
avcodec/opusdec: remove unused headers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-18 09:58:16 +00:00
Michael Niedermayer
b7c19aee6c
avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-18 01:49:35 +01:00
Michael Niedermayer
dfc2a3982f
avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-18 01:49:28 +01:00
Michael Niedermayer
d06dce21a4
Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'
...
* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
wmv2: Return meaningful error codes
Conflicts:
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:34:36 +01:00
Michael Niedermayer
41572ac698
Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'
...
* commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2':
qdm2: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:26:56 +01:00
Michael Niedermayer
d128794fbc
Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
...
* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
libxvid: Return meaningful error messages
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
See: 2a89afb376
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 23:13:12 +01:00
Michael Niedermayer
2e786bc498
avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure
...
This keeps the fields consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:58:31 +01:00
Michael Niedermayer
38e867f6c0
Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'
...
* commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d':
aac_adtstoasc_bsf: Check extradata memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:55:27 +01:00
Michael Niedermayer
62aec0c2d5
Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'
...
* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
avpacket: Check buffer reference
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:47:36 +01:00
Michael Niedermayer
7a7b77e6c9
Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'
...
* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
vorbisdec: Check memory allocations
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:39:32 +01:00
Michael Niedermayer
3d5c0ba816
Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'
...
* commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11':
dvdsubdec: Check memory allocations
Conflicts:
libavcodec/dvdsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 22:31:26 +01:00
Michael Niedermayer
2980c8e7d3
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>
2015-02-17 21:25:07 +01:00
Michael Niedermayer
d2668ae472
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>
2015-02-17 20:18:19 +01:00
Michael Niedermayer
03dab49a12
avcodec/vp56: Add () to protect TRANSPOSE()s arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 19:13:26 +01:00
Himangi Saraogi
42c8f92e2f
wmv2: Return meaningful error codes
2015-02-17 12:18:20 -05:00
Himangi Saraogi
f3e045263e
qdm2: Return meaningful error codes
2015-02-17 12:18:20 -05:00
Himangi Saraogi
a1e2c47cd4
libxvid: Return meaningful error messages
2015-02-17 12:18:20 -05:00
Himangi Saraogi
18f4fa251b
aac_adtstoasc_bsf: Check extradata memory allocation
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-17 12:18:10 -05:00
Vittorio Giovara
fe0f4e5657
avpacket: Check buffer reference
...
CC: libav-stable@libav.org
Bug-Id: CID 1267889
2015-02-17 12:16:43 -05:00
Vittorio Giovara
31dc73e92a
vorbisdec: Check memory allocations
2015-02-17 12:16:43 -05:00
Vittorio Giovara
ec17782e17
dvdsubdec: Check memory allocations
2015-02-17 12:16:43 -05:00
Vittorio Giovara
cb70a93ca1
lavc: Document interaction between avcodec_open2() and decoding routines
2015-02-17 11:27:42 -05:00
Vittorio Giovara
d89e58f539
dct-test: Fix initialization syntax
...
Related to "warning: suggest braces around initialization of subobject".
2015-02-17 11:27:42 -05:00
Christophe Gisquet
398f531915
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>
2015-02-17 15:19:19 +01:00
Michael Niedermayer
e3f7142306
avcodec/vc1dsp: add () to protect the arguments of the op* macros
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 00:02:40 +01:00
Michael Niedermayer
cb9d40451c
avcodec/ac3: add () to protect the macro arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 23:59:39 +01:00
Michael Niedermayer
235782260d
avcodec/me_cmp: add () to protect avg*s arguments
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 23:13:00 +01:00
Michael Niedermayer
17a62cbcb9
avcodec/bmvvideo: Add () to protect NEXT_BYTE() argument
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 23:09:09 +01:00
James Almer
6e3651983c
avcodec/hevcdsp: add missing () to CMP macro
...
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-16 18:56:16 -03:00
Christophe Gisquet
89cb4995fa
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>
2015-02-16 21:53:51 +01:00
James Almer
22596383f3
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>
2015-02-16 17:47:47 -03:00
zhaoxiu.zeng
bf99068089
avcodec/vc1_mc: factor out helper functions for scaling blocks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 19:44:46 +01:00
Clément Bœsch
f9240ec01a
avcodec/gif: fix off by one in column offsetting finding
2015-02-16 17:47:35 +01:00
Seppo Tomperi
e40e446efd
hevcdsp: HEVC deblocking ARM NEON register clobber fix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 13:27:41 +01:00
zhaoxiu.zeng
0f83415569
avcodec/vc1_mc: move median4() to mathops.h
...
Needed for architecture specific optimizations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 11:41:00 +01:00
Diego Biurrun
f8c1719771
dca: Remove separate header for DCA ExSS
...
There is no point in having a separate header for a single declaration.
2015-02-16 10:44:56 +01:00
James Almer
03adafb318
x86/g722dsp: add ff_g722_apply_qmf_sse2
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-02-16 00:41:21 -03:00
Michael Niedermayer
815daf1607
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>
2015-02-16 02:49:22 +01:00
Michael Niedermayer
9d4f836627
Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'
...
* commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda':
dca: Add array sizes to array declarations
Conflicts:
libavcodec/dcadata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 02:29:41 +01:00
Michael Niedermayer
e86f754b1c
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>
2015-02-16 02:16:29 +01:00
Michael Niedermayer
39b40be2a1
Merge commit '73ae0a9d12857852222363f9a7c14d07058ebfd3'
...
* commit '73ae0a9d12857852222363f9a7c14d07058ebfd3':
g722: Split out computation of band->s_zero and unroll code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 02:07:42 +01:00
Michael Niedermayer
9e0a1bd2b9
Merge commit 'b16057b5fe9f02442c52388037891c2e381205fc'
...
* commit 'b16057b5fe9f02442c52388037891c2e381205fc':
g722: Unroll g722_apply_qmf()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 02:00:53 +01:00
Michael Niedermayer
9f1792982e
Merge commit '10f160768b824f00933f33bc69f1fae89a25dfc8'
...
* commit '10f160768b824f00933f33bc69f1fae89a25dfc8':
g722: Reduce number of pointers passed to g722_apply_qmf() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 01:54:19 +01:00
Michael Niedermayer
47df21e172
Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'
...
* commit '67690683130faf37dd9d969ced15eba2a1940ade':
g722: Split out g722_qmf_apply() function into g722dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 01:46:35 +01:00
Diego Biurrun
3a651f599a
dca: Move data tables from a header to an object file
...
This allows sharing them with the DCA XLL extension w/o duplication.
2015-02-15 13:34:04 -08:00
Diego Biurrun
65df9904ce
dca: Add array sizes to array declarations
2015-02-15 13:34:04 -08:00
Peter Meerwald
702458538d
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>
2015-02-15 22:47:21 +02:00
Peter Meerwald
73ae0a9d12
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>
2015-02-15 22:47:19 +02:00
Peter Meerwald
b16057b5fe
g722: Unroll g722_apply_qmf()
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-15 22:47:16 +02:00
Peter Meerwald
10f160768b
g722: Reduce number of pointers passed to g722_apply_qmf() function
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-15 22:47:14 +02:00