Unified · Split
| @@ -54,7 +54,6 @@ · 53 unmodified lines | ||
| 54 | 54 | |
| 55 | 55 | /* always use the same PCM audio parameters */ |
| 56 | 56 | #define WC3_SAMPLE_RATE 22050 |
| 57 | −#define WC3_AUDIO_CHANNELS 1 | |
| 58 | 57 | #define WC3_AUDIO_BITS 16 |
| 59 | 58 | |
| 60 | 59 | /* nice, constant framerate */ |
| @@ -195,13 +194,12 @@ static int wc3_read_header(AVFormatContext *s) · 134 unmodified lines | ||
| 195 | 194 | st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; |
| 196 | 195 | st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; |
| 197 | 196 | st->codecpar->codec_tag = 1; |
| 198 | − st->codecpar->channels = WC3_AUDIO_CHANNELS; | |
| 199 | − st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; | |
| 197 | + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; | |
| 200 | 198 | st->codecpar->bits_per_coded_sample = WC3_AUDIO_BITS; |
| 201 | 199 | st->codecpar->sample_rate = WC3_SAMPLE_RATE; |
| 202 | − st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * | |
| 200 | + st->codecpar->bit_rate = st->codecpar->ch_layout.nb_channels * st->codecpar->sample_rate * | |
| 203 | 201 | st->codecpar->bits_per_coded_sample; |
| 204 | − st->codecpar->block_align = WC3_AUDIO_BITS * WC3_AUDIO_CHANNELS; | |
| 202 | + st->codecpar->block_align = WC3_AUDIO_BITS * st->codecpar->ch_layout.nb_channels; | |
| 205 | 203 | |
| 206 | 204 | return 0; |
| 207 | 205 | } |