comparison segafilm.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 4fd67f05bad9
comparison
equal deleted inserted replaced
3907:7c71e9cabf0e 3908:1d3d17de20ba
146 film->audio_stream_index = st->index; 146 film->audio_stream_index = st->index;
147 st->codec->codec_type = CODEC_TYPE_AUDIO; 147 st->codec->codec_type = CODEC_TYPE_AUDIO;
148 st->codec->codec_id = film->audio_type; 148 st->codec->codec_id = film->audio_type;
149 st->codec->codec_tag = 1; 149 st->codec->codec_tag = 1;
150 st->codec->channels = film->audio_channels; 150 st->codec->channels = film->audio_channels;
151 st->codec->bits_per_sample = film->audio_bits; 151 st->codec->bits_per_coded_sample = film->audio_bits;
152 st->codec->sample_rate = film->audio_samplerate; 152 st->codec->sample_rate = film->audio_samplerate;
153 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * 153 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate *
154 st->codec->bits_per_sample; 154 st->codec->bits_per_coded_sample;
155 st->codec->block_align = st->codec->channels * 155 st->codec->block_align = st->codec->channels *
156 st->codec->bits_per_sample / 8; 156 st->codec->bits_per_coded_sample / 8;
157 } 157 }
158 158
159 /* load the sample table */ 159 /* load the sample table */
160 if (get_buffer(pb, scratch, 16) != 16) 160 if (get_buffer(pb, scratch, 16) != 16)
161 return AVERROR(EIO); 161 return AVERROR(EIO);