# HG changeset patch # User jbr # Date 1257088129 0 # Node ID 942ca859a5874d6e931069678510d4fb0feb1237 # Parent d6780bb3fde642c84cedc8331c268888d62c7549 Set the sample format for Smacker audio in the decoder rather than in the demuxer. diff -r d6780bb3fde6 -r 942ca859a587 smacker.c --- a/smacker.c Fri Oct 30 18:17:16 2009 +0000 +++ b/smacker.c Sun Nov 01 15:08:49 2009 +0000 @@ -183,7 +183,6 @@ 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); }