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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavresample
AgeCommit message (Collapse)Author
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>
2013-02-12lavr: fix mixing matrix reduction when normalization is disabledJustin Ruggles
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.
2013-02-12lavr: fix matrix reduction for upmixing in certain casesJustin Ruggles
Do not skip an output if the corresponding input contributes to other output channels.
2013-02-12lavr: cosmetics: reindentJustin Ruggles
2013-02-12lavr: make sure that the mix function is reset even if no mixing will be doneJustin Ruggles
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.
2013-02-12lavr: print out the mix matrix in ff_audio_mix_set_matrix()Justin Ruggles
This will print the new matrix if it is set after initialization.
2013-01-18Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2013-01-18lavr: always reset mix function names and pointers in mix_function_init()Justin Ruggles
CC: libav-stable@libav.org
2013-01-18lavr: call mix_function_init() in ff_audio_mix_set_matrix()Justin Ruggles
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
2013-01-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2013-01-09Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a'Michael Niedermayer
* 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>
2013-01-08x86: lavr: add SSE2 quantize() for ditheringJustin Ruggles
2013-01-08x86: lavr: add SSE2/AVX dither_int_to_float()Justin Ruggles
2013-01-08Merge commit '8729698d50739524665090e083d1bfdf28235724'Michael Niedermayer
* 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>
2013-01-08Merge commit '074a00d192c0e749d677b008b337da42597e780f'Michael Niedermayer
* 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>
2013-01-08lavr: log channel conversion description for any-to-any functionsJustin Ruggles
2013-01-08lavr: add a public function for setting a custom channel mapJustin Ruggles
This allows reordering, duplication, and silencing of input channels.
2013-01-08lavr: mix: reduce the mixing matrix when possibleJustin Ruggles
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.
2013-01-08lavr: cosmetics: reindentJustin Ruggles
2013-01-08lavr: typedef internal structs in internal.hJustin Ruggles
Simplifies header dependencies by not including all other internal headers in internal.h.
2013-01-06Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06x86: lavr: use the x86inc.asm automatic stack alignment in mixing functionsJustin Ruggles
CC:libav-stable@libav.org
2013-01-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavr: fix missing " in header documentation aviobuf: Discard old buffered, previously read data in ffio_read_partial Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04lavr: fix missing " in header documentationPeter Meerwald
Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com> Signed-off-by: Martin Storsjö <martin@martin.st>
2012-12-21Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21miscellaneous typo fixesDiego Biurrun
2012-12-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavr: add option for dithering during sample format conversion to s16 mpeg12: do not decode extradata more than once. Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 15:45:26 +0300