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/avresample.h | |
| parent | 40ea3438661e6cc30b60bc019ae01fb073eabb35 (diff) | |
| parent | b2fe6756e34d1316d0fa799e8a5ace993059c407 (diff) | |
| download | ffmpeg-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/avresample.h')
| -rw-r--r-- | libavresample/avresample.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavresample/avresample.h b/libavresample/avresample.h index 4841d262c0..34998aa0cc 100644 --- a/libavresample/avresample.h +++ b/libavresample/avresample.h @@ -119,6 +119,15 @@ enum AVResampleFilterType { AV_RESAMPLE_FILTER_TYPE_KAISER, /**< Kaiser Windowed Sinc */ }; +enum AVResampleDitherMethod { + AV_RESAMPLE_DITHER_NONE, /**< Do not use dithering */ + AV_RESAMPLE_DITHER_RECTANGULAR, /**< Rectangular Dither */ + AV_RESAMPLE_DITHER_TRIANGULAR, /**< Triangular Dither*/ + AV_RESAMPLE_DITHER_TRIANGULAR_HP, /**< Triangular Dither with High Pass */ + AV_RESAMPLE_DITHER_TRIANGULAR_NS, /**< Triangular Dither with Noise Shaping */ + AV_RESAMPLE_DITHER_NB, /**< Number of dither types. Not part of ABI. */ +}; + /** * Return the LIBAVRESAMPLE_VERSION_INT constant. */ |