comparison dsicin.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 7d2f3f1b68d8
comparison
equal deleted inserted replaced
3907:7c71e9cabf0e 3908:1d3d17de20ba
128 st->codec->codec_type = CODEC_TYPE_AUDIO; 128 st->codec->codec_type = CODEC_TYPE_AUDIO;
129 st->codec->codec_id = CODEC_ID_DSICINAUDIO; 129 st->codec->codec_id = CODEC_ID_DSICINAUDIO;
130 st->codec->codec_tag = 0; /* no tag */ 130 st->codec->codec_tag = 0; /* no tag */
131 st->codec->channels = 1; 131 st->codec->channels = 1;
132 st->codec->sample_rate = 22050; 132 st->codec->sample_rate = 22050;
133 st->codec->bits_per_sample = 16; 133 st->codec->bits_per_coded_sample = 16;
134 st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_sample * st->codec->channels; 134 st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample * st->codec->channels;
135 st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; 135 st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample;
136 136
137 return 0; 137 return 0;
138 } 138 }
139 139
140 static int cin_read_frame_header(CinDemuxContext *cin, ByteIOContext *pb) { 140 static int cin_read_frame_header(CinDemuxContext *cin, ByteIOContext *pb) {