diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:18:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 12:18:28 +0100 |
| commit | 41135b7f64e699a71250b0c2082ba53b0338069a (patch) | |
| tree | 722cfb318703cc777579faa3d1996f8c340d35cf /libavresample/internal.h | |
| parent | 40ea3438661e6cc30b60bc019ae01fb073eabb35 (diff) | |
| parent | b2fe6756e34d1316d0fa799e8a5ace993059c407 (diff) | |
| download | ffmpeg-streaming-41135b7f64e699a71250b0c2082ba53b0338069a.zip ffmpeg-streaming-41135b7f64e699a71250b0c2082ba53b0338069a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavr: add option for dithering during sample format conversion to s16
mpeg12: do not decode extradata more than once.
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/internal.h')
| -rw-r--r-- | libavresample/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavresample/internal.h b/libavresample/internal.h index 3fd33fe..2e139ab 100644 --- a/libavresample/internal.h +++ b/libavresample/internal.h @@ -53,6 +53,7 @@ struct AVAudioResampleContext { double cutoff; /**< resampling cutoff frequency. 1.0 corresponds to half the output sample rate */ enum AVResampleFilterType filter_type; /**< resampling filter type */ int kaiser_beta; /**< beta value for Kaiser window (only applicable if filter_type == AV_FILTER_TYPE_KAISER) */ + enum AVResampleDitherMethod dither_method; /**< dither method */ int in_channels; /**< number of input channels */ int out_channels; /**< number of output channels */ |
