# HG changeset patch
# User michael
# Date 1220887456 0
# Node ID 8d5e06d2eed8f9dbba0e227e68793a81eb8491dd
# Parent  635ed2559262cc853d872876a09637eab42a46e9
Drop deprecated SAMPLE_FMT_S24.

diff -r 635ed2559262 -r 8d5e06d2eed8 audioconvert.c
--- a/audioconvert.c	Mon Sep 08 15:03:17 2008 +0000
+++ b/audioconvert.c	Mon Sep 08 15:24:16 2008 +0000
@@ -37,7 +37,6 @@
 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 -r 635ed2559262 -r 8d5e06d2eed8 avcodec.h
--- a/avcodec.h	Mon Sep 08 15:03:17 2008 +0000
+++ b/avcodec.h	Mon Sep 08 15:24:16 2008 +0000
@@ -339,7 +339,6 @@
     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 -r 635ed2559262 -r 8d5e06d2eed8 utils.c
--- a/utils.c	Mon Sep 08 15:03:17 2008 +0000
+++ b/utils.c	Mon Sep 08 15:24:16 2008 +0000
@@ -1310,8 +1310,6 @@
         return 8;
     case SAMPLE_FMT_S16:
         return 16;
-    case SAMPLE_FMT_S24:
-        return 24;
     case SAMPLE_FMT_S32:
     case SAMPLE_FMT_FLT:
         return 32;