Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'

[ffmpeg] / libavformat / xvag.c

diff --git a/libavformat/xvag.c b/libavformat/xvag.c
index 92c80a48e8204b041959068f9d1a2094104dbbad..5ef4fb0900304169d38c259a91eb85b34a8dc290 100644 (file)
--- a/libavformat/xvag.c
+++ b/libavformat/xvag.c
@@ -43,7 +43,7 @@ static int xvag_read_header(AVFormatContext *s)
     if (!st)
         return AVERROR(ENOMEM);
 
-    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
 
     offset     = avio_rl32(s->pb);
     big_endian = offset > av_bswap32(offset);
@@ -51,30 +51,30 @@ static int xvag_read_header(AVFormatContext *s)
         offset                 = av_bswap32(offset);
         avio_skip(s->pb, 28);
         codec                  = avio_rb32(s->pb);
-        st->codec->channels    = avio_rb32(s->pb);
+        st->codecpar->channels = avio_rb32(s->pb);
         avio_skip(s->pb, 4);
         st->duration           = avio_rb32(s->pb);
         avio_skip(s->pb, 8);
-        st->codec->sample_rate = avio_rb32(s->pb);
+        st->codecpar->sample_rate = avio_rb32(s->pb);
     } else {
         avio_skip(s->pb, 28);
         codec                  = avio_rl32(s->pb);
-        st->codec->channels    = avio_rl32(s->pb);
+        st->codecpar->channels = avio_rl32(s->pb);
         avio_skip(s->pb, 4);
         st->duration           = avio_rl32(s->pb);
         avio_skip(s->pb, 8);
-        st->codec->sample_rate = avio_rl32(s->pb);
+        st->codecpar->sample_rate = avio_rl32(s->pb);
     }
 
-    if (st->codec->sample_rate <= 0)
+    if (st->codecpar->sample_rate <= 0)
         return AVERROR_INVALIDDATA;
-    if (st->codec->channels <= 0)
+    if (st->codecpar->channels <= 0)
         return AVERROR_INVALIDDATA;
 
     switch (codec) {
     case 0x1c:
-        st->codec->codec_id    = AV_CODEC_ID_ADPCM_PSX;
-        st->codec->block_align = 16 * st->codec->channels;
+        st->codecpar->codec_id    = AV_CODEC_ID_ADPCM_PSX;
+        st->codecpar->block_align = 16 * st->codecpar->channels;
         break;
     default:
         avpriv_request_sample(s, "codec %X", codec);
@@ -84,22 +84,22 @@ static int xvag_read_header(AVFormatContext *s)
     avio_skip(s->pb, offset - avio_tell(s->pb));
 
     if (avio_rb16(s->pb) == 0xFFFB) {
-        st->codec->codec_id    = AV_CODEC_ID_MP3;
-        st->codec->block_align = 0x1000;
+        st->codecpar->codec_id    = AV_CODEC_ID_MP3;
+        st->codecpar->block_align = 0x1000;
         st->need_parsing       = AVSTREAM_PARSE_FULL_RAW;
     }
 
     avio_skip(s->pb, -2);
-    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+    avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
 
     return 0;
 }
 
 static int xvag_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    AVCodecContext *codec = s->streams[0]->codec;
+    AVCodecParameters *par = s->streams[0]->codecpar;
 
-    return av_get_packet(s->pb, pkt, codec->block_align);
+    return av_get_packet(s->pb, pkt, par->block_align);
 }
 
 AVInputFormat ff_xvag_demuxer = {