Mercurial > libavcodec.hg

changeset 3136:ddf6d81a6369 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author alex
date Tue, 21 Feb 2006 22:05:13 +0000
parents 41a01cea8885
children 876d6280faf7
files avcodec.h utils.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/avcodec.h	Tue Feb 21 00:03:10 2006 +0000
+++ b/avcodec.h	Tue Feb 21 22:05:13 2006 +0000
@@ -266,11 +266,14 @@
 };
 
 /* 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 */
--- a/utils.c	Tue Feb 21 00:03:10 2006 +0000
+++ b/utils.c	Tue Feb 21 22:05:13 2006 +0000
@@ -788,6 +788,7 @@
     s->pix_fmt= PIX_FMT_NONE;
     s->frame_skip_cmp= FF_CMP_DCTMAX;
     s->nsse_weight= 8;
+    s->sample_fmt= SAMPLE_FMT_S16; // FIXME: set to NONE
 
     s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS;
     s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS;