diff options
| author | Peter Ross <pross@xvid.org> | 2008-07-31 10:47:31 +0000 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2008-07-31 10:47:31 +0000 |
| commit | fd76c37fd9f564b4e979fbe20ecfcfad13f8b4f4 (patch) | |
| tree | e391aec76fcfa666a50c7ccce172ff7a8d140da9 /libavcodec/libamr.c | |
| parent | c8fd5da42fffc92268a0e23335af36580f2a2a4b (diff) | |
| download | ffmpeg-fd76c37fd9f564b4e979fbe20ecfcfad13f8b4f4.tar.gz | |
Modify all codecs to report their supported input and output sample format(s).
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libamr.c')
| -rw-r--r-- | libavcodec/libamr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/libamr.c b/libavcodec/libamr.c index 0e23de14b1..4f56e4d729 100644 --- a/libavcodec/libamr.c +++ b/libavcodec/libamr.c @@ -134,6 +134,7 @@ static void amr_decode_fix_avctx(AVCodecContext * avctx) } avctx->frame_size = 160 * is_amr_wb; + avctx->sample_fmt = SAMPLE_FMT_S16; } #ifdef CONFIG_LIBAMR_NB_FIXED @@ -516,6 +517,7 @@ AVCodec libamr_nb_encoder = amr_nb_encode_frame, amr_nb_encode_close, NULL, + .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("libamr-nb Adaptive Multi-Rate (AMR) Narrow-Band"), }; @@ -710,6 +712,7 @@ AVCodec libamr_wb_encoder = amr_wb_encode_frame, amr_wb_encode_close, NULL, + .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("libamr-wb Adaptive Multi-Rate (AMR) Wide-Band"), }; |