RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
59,188 Commits 37 Branches 400 Tags 269 MiB
Commit Graph

19 Commits

Author SHA1 Message Date
Michael Niedermayer ccdfa3e271 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add missing #includes for *INT64_MAX and *INT64_C

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffplay.c
	libavformat/assdec.c
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 05:21:19 +01:00
Diego Biurrun 8f8bc92365 Add missing #includes for *INT64_MAX and *INT64_C 2013-11-23 21:55:52 +01:00
Thilo Borgmann d814a839ac Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
Diego Biurrun b5a138652f Give less generic names to global library option arrays 2013-08-02 19:19:02 +02:00
Justin Ruggles b2eea615c0 lavr: allow setting internal_sample_fmt option by string 2013-02-23 17:07:54 -05:00
Justin Ruggles 50f4337a2f lavr: Add "resample_cutoff" option as a duplicate of "cutoff" 
Avoids an option name conflict with libavcodec, which is needed in order
to work properly with avconv.
 2013-02-23 17:07:54 -05:00
Justin Ruggles b2fe6756e3 lavr: add option for dithering during sample format conversion to s16 2012-12-19 18:52:54 -05:00
Justin Ruggles 14758e3211 lavr: temporarily store custom matrix in AVAudioResampleContext 
This allows AudioMix to be treated the same way as other conversion contexts
and removes the requirement to allocate it at the same time as the
AVAudioResampleContext.

The current matrix get/set functions are split between the public interface
and AudioMix private functions.
 2012-12-11 14:00:32 -05:00
Martin Storsjö c7b610aa0b avopt: Explicitly store float/double option defaults in .dbl 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:51 +03:00
Martin Storsjö e6153f173a avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:44 +03:00
Martin Storsjö 124134e424 avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:32 +03:00
Anton Khirnov 4d7adec8bd AVOptions: store defaults for INT64 options in int64 union member. 
Double does not have enough precision to represent all int64 numbers
exactly.
 2012-08-24 11:25:06 +02:00
Martin Storsjö 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
John Stebbins 4cf4028331 libavresample: add mix level normalization option 
Provides an option to disable mix level normalization

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-08-14 23:36:56 +02:00
Justin Ruggles 372647aed0 lavr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-08 15:22:11 -04:00
Justin Ruggles 8ca08066fc lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format 
Also make this the default value.
 2012-07-08 15:22:11 -04:00
John Stebbins 3971be0eb5 Add Dolby/DPLII downmix support to libavresample 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-06-18 10:55:00 -04:00
Justin Ruggles 4010d724e1 lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type 2012-05-01 13:52:59 -04:00
Justin Ruggles 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