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
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
7b32b35bf5
Merge commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8'
...
* commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8':
opus: Factor out imdct15 into a standalone component
Conflicts:
configure
libavcodec/opus_celt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-02-02 20:43:13 +01:00
Diego Biurrun
3d5d46233c
opus: Factor out imdct15 into a standalone component
...
It will be reused by the AAC decoder.
2015-02-02 16:07:33 +01:00
Michael Niedermayer
00d4759134
avcodec/opus_celt: Use avpriv_float_dsp_alloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-12-01 20:03:23 +01:00
Michael Niedermayer
fb33bff990
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
...
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-08-15 21:00:50 +02:00
Gabriel Dume
f929ab0569
cosmetics: Write NULL pointer equality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2014-08-15 03:18:18 -07:00
Michael Niedermayer
d62a4707f9
avcodec/opus_celt: Fix () in CELT_PVQ_V macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-25 19:25:29 +02:00
Carl Eugen Hoyos
30aeab29e4
Use av_restrict instead of restrict in libavcodec/opus_celt.c.
2014-05-16 00:43:54 +02:00
Michael Niedermayer
30cdf384d1
Merge commit 'd3f5b94762fb803c0f3b29f9ad6c5eaa813998ba'
...
* commit 'd3f5b94762fb803c0f3b29f9ad6c5eaa813998ba':
aarch64: opus NEON iMDCT and FFT
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-15 21:13:53 +02:00
Michael Niedermayer
2c7d3ecfc9
Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'
...
* commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222':
lavc: add a native Opus decoder.
Conflicts:
Changelog
configure
libavcodec/version.h
Fate tests pass with both avresample as well as swresample based opus decoder, but
are disabled (reference files are very large so i want to think a day or 2 about
if theres an alternative or if they could be avoided, they also dont match the
official samples)
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-15 18:20:17 +02:00
Janne Grunau
d3f5b94762
aarch64: opus NEON iMDCT and FFT
...
Opus celt decoding 11% faster and the iMDCT over 2.5 times faster on
Apple's A7.
2014-05-15 18:17:02 +02:00
Anton Khirnov
b70d7a4ac7
lavc: add a native Opus decoder.
...
Initial implementation by Andrew D'Addesio <modchipv12@gmail.com > during
GSoC 2012.
Completion by Anton Khirnov <anton@khirnov.net >, sponsored by the
Mozilla Corporation.
Further contributions by:
Christophe Gisquet <christophe.gisquet@gmail.com >
Janne Grunau <janne-libav@jannau.net >
Luca Barbato <lu_zero@gentoo.org >
2014-05-15 06:49:34 +02:00