summaryrefslogtreecommitdiff
path: root/libavcodec/adxdec.c
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2008-07-31 10:47:31 +0000
committerPeter Ross <pross@xvid.org>2008-07-31 10:47:31 +0000
commitfd76c37fd9f564b4e979fbe20ecfcfad13f8b4f4 (patch)
treee391aec76fcfa666a50c7ccce172ff7a8d140da9 /libavcodec/adxdec.c
parentc8fd5da42fffc92268a0e23335af36580f2a2a4b (diff)
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/adxdec.c')
-rw-r--r--libavcodec/adxdec.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c
index 91331c04b1..8765a456dd 100644
--- a/libavcodec/adxdec.c
+++ b/libavcodec/adxdec.c
@@ -30,6 +30,12 @@
* adx2wav & wav2adx http://www.geocities.co.jp/Playtown/2004/
*/
+static av_cold void adx_decode_init(AVCodecContext *avctx)
+{
+ avctx->sample_fmt = SAMPLE_FMT_S16;
+ return 0;
+}
+
/* 18 bytes <-> 32 samples */
static void adx_decode(short *out,const unsigned char *in,PREV *prev)
@@ -161,7 +167,7 @@ AVCodec adpcm_adx_decoder = {
CODEC_TYPE_AUDIO,
CODEC_ID_ADPCM_ADX,
sizeof(ADXContext),
- NULL,
+ adx_decode_init,
NULL,
NULL,
adx_decode_frame,