added none/8bit/24bit audio formats and defaulting to s16 for now (once the system works like pix_fmt, the defaulting should be changed to SAMPLE_FMT_NONE)

Originally committed as revision 5045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-21 22:05:13 +00:00
parent 33f5e2ec3e
commit 1319a77b01
2 changed files with 6 additions and 2 deletions
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -266,11 +266,14 @@ enum PixelFormat {
 };

 /* currently unused, may be used if 24/32 bits samples ever supported */
+/* all in native endian */
 enum SampleFormat {
-    SAMPLE_FMT_S16 = 0,         ///< signed 16 bits
+    SAMPLT_FMT_NONE = -1,
+    SAMPLE_FMT_U8,              ///< unsigned 8 bits
+    SAMPLE_FMT_S16,             ///< signed 16 bits
+    SAMPLE_FMT_S24,             ///< signed 24 bits
    SAMPLE_FMT_S32,             ///< signed 32 bits
    SAMPLE_FMT_FLT,             ///< float
-    SAMPLE_FMT_DBL,             ///< double
 };

 /* in bytes */