X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fpcm.c;h=806f91b6b135e167637c90143a110cfdceb082de;hb=6372c9dc9972318e75a5889ad6c52500b8294099;hp=f62075fc82ee6c3864635cb0b8f8e7854c8bee38;hpb=f6d633d72686e89503dcdf0709e8d4da59ffca0b;p=ffmpeg diff --git a/libavformat/pcm.c b/libavformat/pcm.c index f62075fc82e..806f91b6b13 100644 --- a/libavformat/pcm.c +++ b/libavformat/pcm.c @@ -30,7 +30,7 @@ int ff_pcm_read_packet(AVFormatContext *s, AVPacket *pkt) { int ret, size; - size= RAW_SAMPLES*s->streams[0]->codec->block_align; + size= RAW_SAMPLES*s->streams[0]->codecpar->block_align; if (size <= 0) return AVERROR(EINVAL); @@ -51,10 +51,10 @@ int ff_pcm_read_seek(AVFormatContext *s, st = s->streams[0]; - block_align = st->codec->block_align ? st->codec->block_align : - (av_get_bits_per_sample(st->codec->codec_id) * st->codec->channels) >> 3; - byte_rate = st->codec->bit_rate ? st->codec->bit_rate >> 3 : - block_align * st->codec->sample_rate; + block_align = st->codecpar->block_align ? st->codecpar->block_align : + (av_get_bits_per_sample(st->codecpar->codec_id) * st->codecpar->channels) >> 3; + byte_rate = st->codecpar->bit_rate ? st->codecpar->bit_rate >> 3 : + block_align * st->codecpar->sample_rate; if (block_align <= 0 || byte_rate <= 0) return -1;