Mercurial > libavformat.hg
diff sierravmd.c @ 3908:1d3d17de20ba libavformat
Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
author | michael |
---|---|
date | Mon, 08 Sep 2008 14:24:59 +0000 |
parents | 7a0230981402 |
children | 549a09cf23fe |
line wrap: on
line diff
--- a/sierravmd.c Mon Sep 08 00:58:24 2008 +0000 +++ b/sierravmd.c Mon Sep 08 14:24:59 2008 +0000 @@ -120,13 +120,13 @@ st->codec->sample_rate = vmd->sample_rate; st->codec->block_align = AV_RL16(&vmd->vmd_header[806]); if (st->codec->block_align & 0x8000) { - st->codec->bits_per_sample = 16; + st->codec->bits_per_coded_sample = 16; st->codec->block_align = -(st->codec->block_align - 0x10000); } else { - st->codec->bits_per_sample = 8; + st->codec->bits_per_coded_sample = 8; } st->codec->bit_rate = st->codec->sample_rate * - st->codec->bits_per_sample * st->codec->channels; + st->codec->bits_per_coded_sample * st->codec->channels; /* calculate pts */ num = st->codec->block_align;