mirror of https://git.ffmpeg.org/ffmpeg.git
Drop deprecated SAMPLE_FMT_S24.
Originally committed as revision 15264 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
d578432db8
commit
23694e27f0
|
@ -37,7 +37,6 @@ typedef struct SampleFmtInfo {
|
||||||
static const SampleFmtInfo sample_fmt_info[SAMPLE_FMT_NB] = {
|
static const SampleFmtInfo sample_fmt_info[SAMPLE_FMT_NB] = {
|
||||||
[SAMPLE_FMT_U8] = { .name = "u8", .bits = 8 },
|
[SAMPLE_FMT_U8] = { .name = "u8", .bits = 8 },
|
||||||
[SAMPLE_FMT_S16] = { .name = "s16", .bits = 16 },
|
[SAMPLE_FMT_S16] = { .name = "s16", .bits = 16 },
|
||||||
[SAMPLE_FMT_S24] = { .name = "s24", .bits = 24 },
|
|
||||||
[SAMPLE_FMT_S32] = { .name = "s32", .bits = 32 },
|
[SAMPLE_FMT_S32] = { .name = "s32", .bits = 32 },
|
||||||
[SAMPLE_FMT_FLT] = { .name = "flt", .bits = 32 },
|
[SAMPLE_FMT_FLT] = { .name = "flt", .bits = 32 },
|
||||||
[SAMPLE_FMT_DBL] = { .name = "dbl", .bits = 64 },
|
[SAMPLE_FMT_DBL] = { .name = "dbl", .bits = 64 },
|
||||||
|
|
|
@ -339,7 +339,6 @@ enum SampleFormat {
|
||||||
SAMPLE_FMT_NONE = -1,
|
SAMPLE_FMT_NONE = -1,
|
||||||
SAMPLE_FMT_U8, ///< unsigned 8 bits
|
SAMPLE_FMT_U8, ///< unsigned 8 bits
|
||||||
SAMPLE_FMT_S16, ///< signed 16 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_S32, ///< signed 32 bits
|
||||||
SAMPLE_FMT_FLT, ///< float
|
SAMPLE_FMT_FLT, ///< float
|
||||||
SAMPLE_FMT_DBL, ///< double
|
SAMPLE_FMT_DBL, ///< double
|
||||||
|
|
|
@ -1310,8 +1310,6 @@ int av_get_bits_per_sample_format(enum SampleFormat sample_fmt) {
|
||||||
return 8;
|
return 8;
|
||||||
case SAMPLE_FMT_S16:
|
case SAMPLE_FMT_S16:
|
||||||
return 16;
|
return 16;
|
||||||
case SAMPLE_FMT_S24:
|
|
||||||
return 24;
|
|
||||||
case SAMPLE_FMT_S32:
|
case SAMPLE_FMT_S32:
|
||||||
case SAMPLE_FMT_FLT:
|
case SAMPLE_FMT_FLT:
|
||||||
return 32;
|
return 32;
|
||||||
|
|
Loading…
Reference in New Issue