summaryrefslogtreecommitdiff
path: root/libavcodec/audioconvert.c
Commit message (Collapse)AuthorAge
* lavc: drop deprecated audio_convert API at the next major bumpStefano Sabatini2013-11-03
| | | | | | | Also make AVCODEC_RESAMPLE API removal depends on its presence, since its code depends on it as well. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: Align muxer/demuxer declarations mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning avcodec: remove avcodec_guess_channel_layout() avutil: Add av_get_default_channel_layout() Conflicts: doc/APIchanges libavcodec/mpeg12.c libavformat/cdg.c libavformat/matroskaenc.c libavformat/mpegts.c libavformat/nuv.c libavformat/wav.c libavutil/audioconvert.c libavutil/audioconvert.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: remove avcodec_guess_channel_layout()Justin Ruggles2012-04-05
| | | | | | | | | | It is not public because the header is not installed, and its functionality has been replaced by av_get_default_channel_layout().
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove disabled FF_API_OLD_AUDIOCONVERT cruft.Anton Khirnov2012-01-27
| |
| * lavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.Anton Khirnov2012-01-27
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: Readd #define _SVID_SOURCE Fix av_get_channel_layout_string() for positions >31 configure: Store vda lib flags in extralibs instead of ldflags Make channel layout masks unsigned dca: ARMv6 optimised decode_blockcode() nullenc: drop AVFMT_RAWPICTURE from the flags frame-mt: return consumed packet size in ff_thread_decode_frame aacdec: add more fate tests covering SBR and PS MK(BE)TAG: avoid undefined shifts Conflicts: configure libavcodec/arm/dca.h libavcodec/dca.c libavcodec/mlp_parser.c libavcodec/version.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavutil/audioconvert.c libavutil/avutil.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make channel layout masks unsignedMans Rullgard2011-11-25
| | | | | | | | | | | | | | | | | | | | It makes more sense for a bit mask to use an unsigned type. The change should be source and binary compatible on all supported systems, hence micro version bump. Fixes a few invalid shifts. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases Error out if vaapi is not found avio: undeprecate av_url_read_fseek/fpause under nicer names libvo-*: Don't use deprecated sample format names and enum names DUPLICATE flvdec: Fix support for flvtool2 "keyframes based" generated index DUPLICATE libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32. Convert some undefined 1<<31 shifts into 1U<<31. Conflicts: configure libavcodec/libvo-aacenc.c libavcodec/libvo-amrwbenc.c libavformat/flvdec.c Marged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.Alex Converse2011-04-11
| | | | | | | | | | | | | | (1<<31) is undefined and seems to be evaluated by gcc to -2^31 when these formulae require 2^31. These conversions still need fate tests.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | Merge libavcore into libavutilReinhard Tartler2011-02-16
|/ | | | Done to keep ABI compatible. Otherwise this is just silly
* Use the new libavcore audio channel API.Stefano Sabatini2010-11-21
| | | | | | | This also allows to remove a linking dependency of libavfilter on libavcodec. Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move audio channel API from libavcodec to libavcore.Stefano Sabatini2010-11-21
| | | | Originally committed as revision 25787 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-12
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement functions:Stefano Sabatini2010-11-02
| | | | | | | | | | | | | av_get_sample_fmt_name() av_get_sample_fmt() av_get_sample_fmt_string() in libavcore, and deprecate the corresponding libavcodec/audioconvert.h functions: avcodec_get_sample_fmt_name() avcodec_get_sample_fmt() avcodec_sample_fmt_string() Originally committed as revision 25653 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_get_channel_layout().S.N. Hemanth Meenakshisundaram2010-08-26
| | | | | | Patch by S.N. Hemanth Meenakshisundaram smeenaks:ucsd+edu. Originally committed as revision 24936 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Workaround for missing llrintf()Måns Rullgård2010-04-23
| | | | Originally committed as revision 22954 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move clipping of audio samples (for those codecs outputting float) from decoderRonald S. Bultje2010-04-21
| | | | | | to the audio conversion routines. Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make function get_channel_name() static: It is only used in audioconvert.c.Carl Eugen Hoyos2010-02-28
| | | | Originally committed as revision 22114 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not guess the channel layout when getting its string value.Justin Ruggles2009-06-13
| | | | Originally committed as revision 19185 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove the 3-front-channel layout from the list of channel layoutJustin Ruggles2009-06-13
| | | | | | aliases. Calling this "surround" is confusing and questionable. Originally committed as revision 19183 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check that channel layout is compatible with number of channels forJustin Ruggles2009-04-19
| | | | | | output audio stream. Originally committed as revision 18621 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add 3 channel layout convenience macros.Justin Ruggles2009-04-18
| | | | Originally committed as revision 18609 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add names for 5.0 and 5.1 back speaker channel layouts.Justin Ruggles2009-04-12
| | | | Originally committed as revision 18459 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace snprintf() with av_strlcpy().Patrik2009-02-09
| | | | | | | | | | Fixes the following warning on some systems: audioconvert.c:131: warning: format not a string literal and no format arguments Patch by Patrik patrik A yes D nu Originally committed as revision 17110 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-01
| | | | | | | Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add const, remove warning:Baptiste Coudurier2009-01-22
| | | | | | libavcodec/audioconvert.c:190: warning: initialization discards qualifiers from pointer target type Originally committed as revision 16716 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use "" instead of <> when #including non-system headers.Diego Biurrun2009-01-19
| | | | Originally committed as revision 16689 to svn://svn.ffmpeg.org/ffmpeg/trunk
* One const is enough.Carl Eugen Hoyos2008-11-17
| | | | Originally committed as revision 15847 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change multichannel API define prefix from "CHANNEL_" to "CH_".Andreas Öman2008-11-02
| | | | Originally committed as revision 15768 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add audio channel layout API to libavcodec.Peter Ross2008-11-01
| | | | Originally committed as revision 15762 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove duplicate "const" qualifier for *matrix.Diego Pettenò2008-10-02
| | | | | | | This silences out a warning when compiling with Intel C Compiler. Patch by Diego 'Flameeyes' Pettenò %flameeyes A gmail P com% Originally committed as revision 15524 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Drop deprecated SAMPLE_FMT_S24.Michael Niedermayer2008-09-08
| | | | Originally committed as revision 15264 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add SAMPLE_FMT_DBL.Peter Ross2008-08-19
| | | | Originally committed as revision 14832 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Modify av_audio_convert() to use AVAudioConvert context struct; add ↵Peter Ross2008-08-01
| | | | | | av_audio_convert_alloc() and av_audio_convert_free() support functions. Originally committed as revision 14496 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert r14484 hunk that deleted the 'include avcodec.h' statement.Peter Ross2008-08-01
| | | | Originally committed as revision 14495 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add sample format support functions: avcodec_get_sample_fmt_name(), ↵Peter Ross2008-07-31
| | | | | | avcodec_get_sample_fmt(), avcodec_sample_fmt_string() Originally committed as revision 14484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* license header consistency cosmeticsDiego Biurrun2007-07-05
| | | | Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* misc spelling fixesDiego Biurrun2007-06-12
| | | | Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-07
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmeticsMichael Niedermayer2006-08-19
| | | | Originally committed as revision 6032 to svn://svn.ffmpeg.org/ffmpeg/trunk
* audio format conversionMichael Niedermayer2006-08-19
untested and unused Originally committed as revision 6029 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 21:43:14 +0000