summaryrefslogtreecommitdiff
path: root/libavformat/sierravmd.c
diff options
context:
space:
mode:
authorLuca Abeni <lucabe72@email.it>2008-09-08 14:24:59 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-08 14:24:59 +0000
commitdd1c8f3e6e5380f993c86750bb09fd42e130143f (patch)
tree2ae5b2bbda1b685069f4db6ed408097288590dde /libavformat/sierravmd.c
parent71375e05006e68fecdeb8d5fa80c3cce52a5cf86 (diff)
downloadffmpeg-dd1c8f3e6e5380f993c86750bb09fd42e130143f.tar.gz
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! Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/sierravmd.c')
-rw-r--r--libavformat/sierravmd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index 7b0e700718..20c4f58022 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -120,13 +120,13 @@ static int vmd_read_header(AVFormatContext *s,
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;