summaryrefslogtreecommitdiff
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2006-02-21 22:05:13 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2006-02-21 22:05:13 +0000
commit1319a77b017137b676bad3dfb80bffb058c2bc8f (patch)
treece98392d7072bffb7e53fa86c4ccd39ea9c0dfa1 /libavcodec/utils.c
parent33f5e2ec3ec7e2a8a3e8092f9aba802bd9cc2be2 (diff)
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
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 04d5081c7d..235c0676d7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -788,6 +788,7 @@ void avcodec_get_context_defaults(AVCodecContext *s){
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;