diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-08 15:24:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-08 15:24:16 +0000 |
| commit | 23694e27f0520084148d3eaa2f8d580a5e99a11c (patch) | |
| tree | 44bfe3f777cd864b62b110b0c7277f5b2c3a1038 /libavcodec | |
| parent | d578432db86762cb131c6b8ac57d20338a866bdb (diff) | |
| download | ffmpeg-23694e27f0520084148d3eaa2f8d580a5e99a11c.tar.gz | |
Drop deprecated SAMPLE_FMT_S24.
Originally committed as revision 15264 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/audioconvert.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c index 15d56e8502..745f01de38 100644 --- a/libavcodec/audioconvert.c +++ b/libavcodec/audioconvert.c @@ -37,7 +37,6 @@ typedef struct SampleFmtInfo { static const SampleFmtInfo sample_fmt_info[SAMPLE_FMT_NB] = { [SAMPLE_FMT_U8] = { .name = "u8", .bits = 8 }, [SAMPLE_FMT_S16] = { .name = "s16", .bits = 16 }, - [SAMPLE_FMT_S24] = { .name = "s24", .bits = 24 }, [SAMPLE_FMT_S32] = { .name = "s32", .bits = 32 }, [SAMPLE_FMT_FLT] = { .name = "flt", .bits = 32 }, [SAMPLE_FMT_DBL] = { .name = "dbl", .bits = 64 }, diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 05f79c87a1..6a58ea732b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -339,7 +339,6 @@ enum SampleFormat { SAMPLE_FMT_NONE = -1, SAMPLE_FMT_U8, ///< unsigned 8 bits SAMPLE_FMT_S16, ///< signed 16 bits - SAMPLE_FMT_S24, ///< signed 24 bits @deprecated Deprecated in favor of SAMPLE_FMT_S32 SAMPLE_FMT_S32, ///< signed 32 bits SAMPLE_FMT_FLT, ///< float SAMPLE_FMT_DBL, ///< double diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 1d00854287..adda58658b 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1310,8 +1310,6 @@ int av_get_bits_per_sample_format(enum SampleFormat sample_fmt) { return 8; case SAMPLE_FMT_S16: return 16; - case SAMPLE_FMT_S24: - return 24; case SAMPLE_FMT_S32: case SAMPLE_FMT_FLT: return 32; |