40d552dae6
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
...
* 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-20 03:19:47 +02:00
1a3eb042c7
Replace av_dlog with normal av_log at trace level
...
This applies to every library where performance is not critical.
2015-04-19 12:41:59 +01:00
c939eea107
Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'
...
* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e':
lavr: Update the planar check in ff_audio_convert
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-17 21:43:06 +02:00
11db644a8e
lavr: Update the planar check in ff_audio_convert
...
Leftover from fbc0b86599
2014-08-17 16:11:02 +02:00
c62fea7574
Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'
...
* commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd':
lavr: Do not change the sample format for mono audio
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 02:49:48 +02:00
fbc0b86599
lavr: Do not change the sample format for mono audio
...
This treats mono as planar internally within libavresample rather
than changing the sample format.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-03 23:13:26 +02:00
96a4d0c1c3
Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'
...
* commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924':
aarch64: NEON float to s16 audio conversion
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-22 23:33:07 +02:00
f4d5a2cc35
aarch64: NEON float to s16 audio conversion
2014-04-22 19:35:41 +02:00
d814a839ac
Reinstate proper FFmpeg license for all files.
2013-08-30 15:47:38 +00:00
1ccf82cfd8
lavr: cosmetics: reindent
2013-01-07 21:49:06 -05:00
074a00d192
lavr: add a public function for setting a custom channel map
...
This allows reordering, duplication, and silencing of input channels.
2013-01-07 21:49:06 -05:00
4d68269d58
lavr: typedef internal structs in internal.h
...
Simplifies header dependencies by not including all other internal headers
in internal.h.
2013-01-07 21:49:05 -05:00
b2fe6756e3
lavr: add option for dithering during sample format conversion to s16
2012-12-19 18:52:54 -05:00
7f534d11ed
lavr: do not pass sample count as a parameter to ff_audio_convert()
...
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-11-27 16:49:18 -05:00
643b5b794f
ARM: libavresample: NEON optimised flat float to s16 conversion
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-09-13 19:15:42 +01:00
1d9c2dc89a
Don't include common.h from avutil.h
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-15 22:32:06 +03:00
c8af852b97
Add libavresample
...
This is a new library for audio sample format, channel layout, and sample rate
conversion.
2012-04-24 21:28:27 -04:00
Michael Niedermayer