From fd76c37fd9f564b4e979fbe20ecfcfad13f8b4f4 Mon Sep 17 00:00:00 2001
From: Peter Ross <pross@xvid.org>
Date: Thu, 31 Jul 2008 10:47:31 +0000
Subject: 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
---
 libavcodec/g726.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libavcodec/g726.c')

diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index bace3d045b..463d993137 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -323,6 +323,9 @@ static av_cold int g726_init(AVCodecContext * avctx)
         return AVERROR(ENOMEM);
     avctx->coded_frame->key_frame = 1;
 
+    if (avctx->codec->decode)
+        avctx->sample_fmt = SAMPLE_FMT_S16;
+
     return 0;
 }
 
@@ -381,6 +384,7 @@ AVCodec adpcm_g726_encoder = {
     g726_encode_frame,
     g726_close,
     NULL,
+    .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
 };
 #endif //CONFIG_ENCODERS
-- 
cgit v1.2.3