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 | |
| 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
| -rw-r--r-- | libavcodec/smacker.c | 1 | ||||
| -rw-r--r-- | libavformat/smacker.c | 1 |
2 files changed, 1 insertions, 1 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; } diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 7d0a8d59d4..8ec28bcd3b 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -183,7 +183,6 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap) ast[i]->codec->bits_per_coded_sample = (smk->rates[i] & SMK_AUD_16BITS) ? 16 : 8; if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == CODEC_ID_PCM_U8) ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE; - ast[i]->codec->sample_fmt = ast[i]->codec->bits_per_coded_sample == 8 ? SAMPLE_FMT_U8 : SAMPLE_FMT_S16; av_set_pts_info(ast[i], 64, 1, ast[i]->codec->sample_rate * ast[i]->codec->channels * ast[i]->codec->bits_per_coded_sample / 8); } |