Mercurial > libavformat.hg
comparison wc3movie.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 |
---|---|
257 wc3->audio_stream_index = st->index; | 257 wc3->audio_stream_index = st->index; |
258 st->codec->codec_type = CODEC_TYPE_AUDIO; | 258 st->codec->codec_type = CODEC_TYPE_AUDIO; |
259 st->codec->codec_id = CODEC_ID_PCM_S16LE; | 259 st->codec->codec_id = CODEC_ID_PCM_S16LE; |
260 st->codec->codec_tag = 1; | 260 st->codec->codec_tag = 1; |
261 st->codec->channels = WC3_AUDIO_CHANNELS; | 261 st->codec->channels = WC3_AUDIO_CHANNELS; |
262 st->codec->bits_per_sample = WC3_AUDIO_BITS; | 262 st->codec->bits_per_coded_sample = WC3_AUDIO_BITS; |
263 st->codec->sample_rate = WC3_SAMPLE_RATE; | 263 st->codec->sample_rate = WC3_SAMPLE_RATE; |
264 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * | 264 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * |
265 st->codec->bits_per_sample; | 265 st->codec->bits_per_coded_sample; |
266 st->codec->block_align = WC3_AUDIO_BITS * WC3_AUDIO_CHANNELS; | 266 st->codec->block_align = WC3_AUDIO_BITS * WC3_AUDIO_CHANNELS; |
267 | 267 |
268 return 0; | 268 return 0; |
269 } | 269 } |
270 | 270 |