summaryrefslogtreecommitdiff
path: root/libavresample
Commit message (Collapse)AuthorAge
* avresample: Include libavutil/avutil.h in version.hJames Almer2013-12-06
| | | | | | | 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>
* Add Windows resource file support for shared librariesJames Almer2013-12-05
| | | | | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-23
| |
* | Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | * commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5': lavr: check that current_buffer is not NULL before using it Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: check that current_buffer is not NULL before using itJustin Ruggles2013-10-27
| | | | | | | | | | | | | | Fixes a segfault during resampling when compiled with -DDEBUG. Fixes all fate-lavr-resample tests with -DDEBUG. CC:libav-stable@libav.org
* | Merge commit '206895708ea2b464755d340e44501daf9a07c310'Michael Niedermayer2013-10-14
|\| | | | | | | | | | | | | * commit '206895708ea2b464755d340e44501daf9a07c310': x86inc: Remove our FMA4 support Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Remove our FMA4 supportDerek Buitenhuis2013-10-14
| | | | | | | | | | | | | | | | 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>
* | Merge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'Michael Niedermayer2013-10-14
|\| | | | | | | | | | | | | * commit '15748773bf33c110e6e2e9526c7ba5478274c74c': avresample/x86: Switch operand order for mulps Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample/x86: Switch operand order for mulpsDerek Buitenhuis2013-10-14
| | | | | | | | | | | | | | | | 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>
* | Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | * commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c': audio_mix: fix channel order in mix_1_to_2_fltp_flt_c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * audio_mix: fix channel order in mix_1_to_2_fltp_flt_cAnton Khirnov2013-10-12
| | | | | | | | CC:libav-stable@libav.org
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-30
| |
* | Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Give less generic names to global library option arraysDiego Biurrun2013-08-02
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-26
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: miscellaneous typo fixes Conflicts: configure libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * miscellaneous typo fixesDiego Biurrun2013-07-25
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Consistently use "cpu_flags" as variable/parameter name for CPU flagsDiego Biurrun2013-07-18
| |
* | Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'Michael Niedermayer2013-05-18
|\| | | | | | | | | | | | | | | * 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>
| * lavr doxy: add version.h to the lavr groupAnton Khirnov2013-05-17
| |
* | Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'Michael Niedermayer2013-05-05
|\| | | | | | | | | | | | | * commit 'e445647b4fdf481b13b2743b303d84de4f43bedd': avresample: Add av_cold attributes to init functions missing them Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: Add av_cold attributes to init functions missing themDiego Biurrun2013-05-04
| |
* | Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'Michael Niedermayer2013-03-28
|\| | | | | | | | | | | | | | | | | | | * commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove unnecessary extern keywords from function declarationsDiego Biurrun2013-03-27
| |
* | Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'Michael Niedermayer2013-02-24
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavr: allow setting internal_sample_fmt option by stringJustin Ruggles2013-02-23
| |
| * lavr: Add "resample_cutoff" option as a duplicate of "cutoff"Justin Ruggles2013-02-23
| | | | | | | | | | Avoids an option name conflict with libavcodec, which is needed in order to work properly with avconv.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | * 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>
| * lavr: fix mixing matrix reduction when normalization is disabledJustin Ruggles2013-02-12
| | | | | | | | | | | | | | In some cases when an input contributes fully to the corresponding output, other inputs may also contribute to the same output. This is the case, for example, for the default 5.1 to stereo downmix matrix without normalization.
| * lavr: fix matrix reduction for upmixing in certain casesJustin Ruggles2013-02-12
| | | | | | | | | | Do not skip an output if the corresponding input contributes to other output channels.
| * lavr: cosmetics: reindentJustin Ruggles2013-02-12
| |
* | Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | | | * 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>
| * lavr: make sure that the mix function is reset even if no mixing will be doneJustin Ruggles2013-02-12
| | | | | | | | | | If the matrix reduction ends up with no mixing matrix needed, we need to still reset the mix function accordingly and log the info to the user.
| * lavr: print out the mix matrix in ff_audio_mix_set_matrix()Justin Ruggles2013-02-12
| | | | | | | | This will print the new matrix if it is set after initialization.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: avoid pointless copying of ref lists lavr: always reset mix function names and pointers in mix_function_init() lavr: call mix_function_init() in ff_audio_mix_set_matrix() fate: update ref after rv30_loop_filter fix rv30: fix masking in rv30_loop_filter() Conflicts: tests/ref/fate/filter-delogo tests/ref/fate/rv30 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: always reset mix function names and pointers in mix_function_init()Justin Ruggles2013-01-17
| | | | | | | | CC: libav-stable@libav.org
| * lavr: call mix_function_init() in ff_audio_mix_set_matrix()Justin Ruggles2013-01-17
| | | | | | | | | | | | | | | | This is needed if a custom matrix is set by the user after opening the AVAudioResampleContext because the matrix channel count can change if different mixing coefficients are used. CC:libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: xan: Convert to bytestream2 oggenc: add a page_duration option and deprecate the pagesize option x86: lavr: add SSE2/AVX dither_int_to_float() Conflicts: libavcodec/xan.c libavformat/oggenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: lavr: add SSE2/AVX dither_int_to_float()Justin Ruggles2013-01-08
| |
* | Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a'Michael Niedermayer2013-01-09
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1fb8f6a44f06e48386450fe0363aefc02583d24a': x86: lavr: add SSE2 quantize() for dithering doc/APIchanges: fill in missing dates and hashes. rtpdec_vp8: Request a keyframe if RTP packets are lost Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: lavr: add SSE2 quantize() for ditheringJustin Ruggles2013-01-08
| |
* | Merge commit '8729698d50739524665090e083d1bfdf28235724'Michael Niedermayer2013-01-08
|\| | | | | | | | | | | | | | | | | | | * commit '8729698d50739524665090e083d1bfdf28235724': rtsp: Recheck the reordering queue if getting a new packet lavr: log channel conversion description for any-to-any functions lavr: mix: reduce the mixing matrix when possible lavr: cosmetics: reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: log channel conversion description for any-to-any functionsJustin Ruggles2013-01-07
| |
| * lavr: mix: reduce the mixing matrix when possibleJustin Ruggles2013-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the matrix results in an output channel not getting a contribution from any input channel and the corresponding input channel does not contribute to any outputs, we can skip the channel during mixing and silence it after mixing. If the matrix results in an input channel not contributing to any output channels and it is not in the output mix, or if the input channel only contributes fully to the same output channel, we can skip the channel during mixing. If the matrix results in an output channel only getting full contribution from the corresponding input channel and that input channel does not contribute to any other output channels, we can skip the channel during mixing.
| * lavr: cosmetics: reindentJustin Ruggles2013-01-07
| |
* | Merge commit '074a00d192c0e749d677b008b337da42597e780f'Michael Niedermayer2013-01-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '074a00d192c0e749d677b008b337da42597e780f': lavr: add a public function for setting a custom channel map lavr: typedef internal structs in internal.h doc: Extend commit message section Conflicts: doc/APIchanges doc/developer.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: add a public function for setting a custom channel mapJustin Ruggles2013-01-07
| | | | | | | | This allows reordering, duplication, and silencing of input channels.
| * lavr: typedef internal structs in internal.hJustin Ruggles2013-01-07
| | | | | | | | | | Simplifies header dependencies by not including all other internal headers in internal.h.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-06
|\| | | | | | | | | | | | | * qatar/master: x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 23:57:37 +0000