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
AgeCommit message (Collapse)Author
2015-04-20Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer
* 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>
2015-04-19Replace av_dlog with normal av_log at trace levelVittorio Giovara
This applies to every library where performance is not critical.
2014-08-17Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'Michael Niedermayer
* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e': lavr: Update the planar check in ff_audio_convert Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-17lavr: Update the planar check in ff_audio_convertLuca Barbato
Leftover from fbc0b8659967ea54a8472b5f795270d38bb085dd. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-04Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'Michael Niedermayer
* commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd': lavr: Do not change the sample format for mono audio Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04lavr: Do not change the sample format for mono audioJustin Ruggles
This treats mono as planar internally within libavresample rather than changing the sample format. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-23Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'Michael Niedermayer
* commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924': aarch64: NEON float to s16 audio conversion Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-22aarch64: NEON float to s16 audio conversionJanne Grunau
2013-08-30Reinstate proper FFmpeg license for all files.Thilo Borgmann
2013-01-08lavr: cosmetics: reindentJustin 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: typedef internal structs in internal.hJustin Ruggles
Simplifies header dependencies by not including all other internal headers in internal.h.
2012-12-20lavr: add option for dithering during sample format conversion to s16Justin Ruggles
2012-11-28lavr: do not pass sample count as a parameter to ff_audio_convert()Justin Ruggles
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.
2012-09-13ARM: libavresample: NEON optimised flat float to s16 conversionMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-15Don't include common.h from avutil.hMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-04-25Add libavresampleJustin Ruggles
This is a new library for audio sample format, channel layout, and sample rate conversion.