X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavformat%2Fads.c;h=73ea7c7d54b8c46d9a3b4d7f43c1dcd85be4e59e;hb=2aad631a818cc49fc30da349c319abfb119adea1;hp=bda2673bad866bfc103e7cb7abda81204c39fcb8;hpb=2814f06abf43455a470e5a509c21c65faa2e53c1;p=ffmpeg

diff --git a/libavformat/ads.c b/libavformat/ads.c
index bda2673bad8..73ea7c7d54b 100644
--- a/libavformat/ads.c
+++ b/libavformat/ads.c
@@ -42,39 +42,39 @@ static int ads_read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
 
     avio_skip(s->pb, 8);
-    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->codec_type  = AVMEDIA_TYPE_AUDIO;
     codec                  = avio_rl32(s->pb);
-    st->codec->sample_rate = avio_rl32(s->pb);
-    if (st->codec->sample_rate <= 0)
+    st->codecpar->sample_rate = avio_rl32(s->pb);
+    if (st->codecpar->sample_rate <= 0)
         return AVERROR_INVALIDDATA;
-    st->codec->channels    = avio_rl32(s->pb);
-    if (st->codec->channels <= 0)
+    st->codecpar->channels    = avio_rl32(s->pb);
+    if (st->codecpar->channels <= 0)
         return AVERROR_INVALIDDATA;
     align                  = avio_rl32(s->pb);
-    if (align <= 0 || align > INT_MAX / st->codec->channels)
+    if (align <= 0 || align > INT_MAX / st->codecpar->channels)
         return AVERROR_INVALIDDATA;
 
     if (codec == 1)
-        st->codec->codec_id = AV_CODEC_ID_PCM_S16LE_PLANAR;
+        st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE_PLANAR;
     else
-        st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX;
+        st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX;
 
-    st->codec->block_align = st->codec->channels * align;
+    st->codecpar->block_align = st->codecpar->channels * align;
     avio_skip(s->pb, 12);
     size = avio_rl32(s->pb);
-    if (st->codec->codec_id == AV_CODEC_ID_ADPCM_PSX)
-        st->duration = (size - 0x40) / 16 / st->codec->channels * 28;
-    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+    if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_PSX)
+        st->duration = (size - 0x40) / 16 / st->codecpar->channels * 28;
+    avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
 
     return 0;
 }
 
 static int ads_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    AVCodecContext *codec = s->streams[0]->codec;
+    AVCodecParameters *par = s->streams[0]->codecpar;
     int ret;
 
-    ret = av_get_packet(s->pb, pkt, codec->block_align);
+    ret = av_get_packet(s->pb, pkt, par->block_align);
     pkt->stream_index = 0;
     return ret;
 }