summaryrefslogtreecommitdiff
path: root/libavresample/audio_convert.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-201-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-191-2/+2
| | | | | | | | This applies to every library where performance is not critical.
* | Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'Michael Niedermayer2014-08-171-2/+2
|\ \ | |/ | | | | | | | | | | * commit '11db644a8e54f02e54d2eaad343a87fcb697c15e': lavr: Update the planar check in ff_audio_convert Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: Update the planar check in ff_audio_convertLuca Barbato2014-08-171-2/+2
| | | | | | | | | | | | Leftover from fbc0b8659967ea54a8472b5f795270d38bb085dd. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'Michael Niedermayer2014-08-041-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd': lavr: Do not change the sample format for mono audio Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: Do not change the sample format for mono audioJustin Ruggles2014-08-031-2/+2
| | | | | | | | | | | | | | This treats mono as planar internally within libavresample rather than changing the sample format. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'Michael Niedermayer2014-04-221-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924': aarch64: NEON float to s16 audio conversion Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: NEON float to s16 audio conversionJanne Grunau2014-04-221-0/+2
| |
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-301-4/+4
|/
* lavr: cosmetics: reindentJustin Ruggles2013-01-071-25/+28
|
* lavr: add a public function for setting a custom channel mapJustin Ruggles2013-01-071-3/+46
| | | | This allows reordering, duplication, and silencing of input channels.
* lavr: typedef internal structs in internal.hJustin Ruggles2013-01-071-1/+0
| | | | | Simplifies header dependencies by not including all other internal headers in internal.h.
* lavr: add option for dithering during sample format conversion to s16Justin Ruggles2012-12-191-1/+32
|
* lavr: do not pass sample count as a parameter to ff_audio_convert()Justin Ruggles2012-11-271-1/+2
| | | | | It will always be the number of samples in the input buffer, so just use that directly instead of passing it as a separate parameter.
* ARM: libavresample: NEON optimised flat float to s16 conversionMans Rullgard2012-09-131-0/+2
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+1
| | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* Add libavresampleJustin Ruggles2012-04-241-0/+334
This is a new library for audio sample format, channel layout, and sample rate conversion.