diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-11-01 15:08:49 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-11-01 15:08:49 +0000 |
| commit | dee34af4d6eec7cfb2f96e81d6b7f5719a04a866 (patch) | |
| tree | 1665cd9630dacd1cd37081e2b89e942202ec0cff /libavcodec | |
| parent | faa374b72cdda0dd6ab9eab9116d02fabc147644 (diff) | |
| download | ffmpeg-dee34af4d6eec7cfb2f96e81d6b7f5719a04a866.tar.gz | |
Set the sample format for Smacker audio in the decoder rather than in the
demuxer.
Originally committed as revision 20429 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/smacker.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 18eaebc6ad..19f0b289e5 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -555,6 +555,7 @@ static av_cold int decode_end(AVCodecContext *avctx) static av_cold int smka_decode_init(AVCodecContext *avctx) { avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO; + avctx->sample_fmt = avctx->bits_per_coded_sample == 8 ? SAMPLE_FMT_U8 : SAMPLE_FMT_S16; return 0; } |