Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavresample
AgeCommit message (Collapse)Author
2014-02-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavr: return an error if a avresample_open() is called on an open context Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-23Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'Michael Niedermayer
* commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731': lavr: add a function for checking whether AVAudioResampleContext is open Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22lavr: return an error if a avresample_open() is called on an open contextAnton Khirnov
2014-02-22lavr: add a function for checking whether AVAudioResampleContext is openAnton Khirnov
2014-02-08Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'Michael Niedermayer
* commit '76a75c523cd3c63560185394a0a5cd7249db962a': lavr: mix front center channel as indicated in the ATSC A/52 specification. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08lavr: mix front center channel as indicated in the ATSC A/52 specification.Tim Walker
When mixing 3 front channels into 2, the center channel is mixed into left and right with the center mix level, not -3dB.
2014-02-08Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'Michael Niedermayer
* commit '5bcbb516f2ff45290ef7995b081762e668693672': arm: Add X() around all references to extern symbols Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-07arm: Add X() around all references to extern symbolsMartin Storsjö
Don't rely on the fact that an unprefixed label currently exists. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-01-15Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aarch64: port neon clobber test from arm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-15aarch64: port neon clobber test from armJanne Grunau
2014-01-13Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'Michael Niedermayer
* commit '99e20125232d40ea239a5b54d26bbfe526506114': x86/arm: Add clobber tests to libavresample Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-13x86/arm: Add clobber tests to libavresampleMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-01-04Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'Michael Niedermayer
* commit 'cc976a75dffa148d655b52604331679ff669e8a2': audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-04Merge commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'Michael Niedermayer
* commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891': audio_mix: fix zeroing output channels in certain cases Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-04Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'Michael Niedermayer
* commit '3d95d27376e59de14f984e7a22a52e066d85df35': audio_mix: initialize the data pointers to NULL Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-03audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with ↵Anton Khirnov
output zeroing
2014-01-03audio_mix: fix zeroing output channels in certain casesAnton Khirnov
Specifically, when the corresponding input channel exists and its matrix column is all-zero (which is necessary for zeroing the output), the matrix column must be removed from the matrix. This is not done currently, so the mixing code would end up using uninitialized pointers from stack. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
2014-01-03audio_mix: initialize the data pointers to NULLAnton Khirnov
This should make it easier to catch problems where some of those pointers are used uninitialized, since reading from NULL should always crash, while random numbers from stack can turn out to be valid pointers, so random memory may be silently overwritten.
2013-12-27Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'Michael Niedermayer
* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0': avutil: Move library version related macros to version.h Conflicts: libavcodec/version.h libavresample/version.h libavutil/avutil.h libavutil/utils.c See: 183117fed7d0a910b5f65e5c78b065f125abf369 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-26avutil: Move library version related macros to version.hDiego Biurrun
This is a more sensible place for these macros.
2013-12-07avresample: Include libavutil/avutil.h in version.hJames Almer
Should fix issues compiling lavr's Windows resource file. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Add Windows resource file support for shared librariesJames Almer
Originally written by James Almer <jamrial@gmail.com> With the following contributions by Timothy Gu <timothygu99@gmail.com> * Use descriptions of libraries from the pkg-config file generation function * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser) * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the file is distributed" [1]. * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1]. * Only build the .rc files when --enable-small is not enabled. [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-10-28Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'Michael Niedermayer
* commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5': lavr: check that current_buffer is not NULL before using it Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27lavr: check that current_buffer is not NULL before using itJustin Ruggles
Fixes a segfault during resampling when compiled with -DDEBUG. Fixes all fate-lavr-resample tests with -DDEBUG. CC:libav-stable@libav.org
2013-10-14Merge commit '206895708ea2b464755d340e44501daf9a07c310'Michael Niedermayer
* commit '206895708ea2b464755d340e44501daf9a07c310': x86inc: Remove our FMA4 support Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14Merge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'Michael Niedermayer
* commit '15748773bf33c110e6e2e9526c7ba5478274c74c': avresample/x86: Switch operand order for mulps Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14x86inc: Remove our FMA4 supportDerek Buitenhuis
This is so we can sync to x264's version of FMA4 support. This partialy reverts commit 79687079a97a039c325ab79d7a95920d800b791f. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-14avresample/x86: Switch operand order for mulpsDerek Buitenhuis
With the forthcoming VEX instruction emulation, mulps must have only the third operand point to memory, as this is what vmulps expects. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-13Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'Michael Niedermayer
* commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c': audio_mix: fix channel order in mix_1_to_2_fltp_flt_c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12audio_mix: fix channel order in mix_1_to_2_fltp_flt_cAnton Khirnov
CC:libav-stable@libav.org
2013-08-30Reinstate proper FFmpeg license for all files.Thilo Borgmann
2013-08-03Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'Michael Niedermayer
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e': Give less generic names to global library option arrays Conflicts: libavcodec/options_table.h libavfilter/avfilter.c libavformat/options_table.h libswscale/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-02Give less generic names to global library option arraysDiego Biurrun
2013-07-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: miscellaneous typo fixes Conflicts: configure libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-25miscellaneous typo fixesDiego Biurrun
2013-07-18Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Consistently use "cpu_flags" as variable/parameter name for CPU flags Conflicts: libavcodec/x86/dsputil_init.c libavcodec/x86/h264dsp_init.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/motion_est.c libavcodec/x86/mpegvideo.c libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-18Consistently use "cpu_flags" as variable/parameter name for CPU flagsDiego Biurrun
2013-05-18Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'Michael Niedermayer
* commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca': lavr doxy: add version.h to the lavr group lavc doxy: add avcodec.h to the libavcodec group. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17lavr doxy: add version.h to the lavr groupAnton Khirnov
2013-05-05Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'Michael Niedermayer
* commit 'e445647b4fdf481b13b2743b303d84de4f43bedd': avresample: Add av_cold attributes to init functions missing them Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04avresample: Add av_cold attributes to init functions missing themDiego Biurrun
2013-03-28Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'Michael Niedermayer
* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27cosmetics: Remove unnecessary extern keywords from function declarationsDiego Biurrun
2013-02-24Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'Michael Niedermayer
* commit '45235ac488363e3360bf2f2275102d1ec66eba0f': configure: Move x11grab option to a more suitable place in the help output lavr: allow setting internal_sample_fmt option by string lavr: Add "resample_cutoff" option as a duplicate of "cutoff" Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24lavr: allow setting internal_sample_fmt option by stringJustin Ruggles
2013-02-24lavr: Add "resample_cutoff" option as a duplicate of "cutoff"Justin Ruggles
Avoids an option name conflict with libavcodec, which is needed in order to work properly with avconv.
2013-02-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavr: fix mixing matrix reduction when normalization is disabled lavr: fix matrix reduction for upmixing in certain cases lavr: cosmetics: reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-13Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'Michael Niedermayer
* commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90': lavr: make sure that the mix function is reset even if no mixing will be done lavr: print out the mix matrix in ff_audio_mix_set_matrix() ws-snd1: decode directly to the user-provided AVFrame wmavoice: decode directly to the user-provided AVFrame Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 02:10:25 +0300