diff amr.c @ 820:feca73904e67 libavformat

changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
author michael
date Sun, 17 Jul 2005 22:24:36 +0000
parents c5077fdab490
children da1d5db0ce5c
line wrap: on
line diff
--- a/amr.c	Sun Jul 17 00:28:12 2005 +0000
+++ b/amr.c	Sun Jul 17 22:24:36 2005 +0000
@@ -31,7 +31,7 @@
 static int amr_write_header(AVFormatContext *s)
 {
     ByteIOContext *pb = &s->pb;
-    AVCodecContext *enc = &s->streams[0]->codec;
+    AVCodecContext *enc = s->streams[0]->codec;
 
     s->priv_data = NULL;
 
@@ -100,11 +100,11 @@
             return AVERROR_NOMEM;
         }
     
-        st->codec.codec_type = CODEC_TYPE_AUDIO;
-        st->codec.codec_tag = MKTAG('s', 'a', 'w', 'b');
-        st->codec.codec_id = CODEC_ID_AMR_WB;
-        st->codec.channels = 1;
-        st->codec.sample_rate = 16000;
+        st->codec->codec_type = CODEC_TYPE_AUDIO;
+        st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b');
+        st->codec->codec_id = CODEC_ID_AMR_WB;
+        st->codec->channels = 1;
+        st->codec->sample_rate = 16000;
     }
     else
     {
@@ -114,11 +114,11 @@
             return AVERROR_NOMEM;
         }
     
-        st->codec.codec_type = CODEC_TYPE_AUDIO;
-        st->codec.codec_tag = MKTAG('s', 'a', 'm', 'r');
-        st->codec.codec_id = CODEC_ID_AMR_NB;
-        st->codec.channels = 1;
-        st->codec.sample_rate = 8000;
+        st->codec->codec_type = CODEC_TYPE_AUDIO;
+        st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
+        st->codec->codec_id = CODEC_ID_AMR_NB;
+        st->codec->channels = 1;
+        st->codec->sample_rate = 8000;
     }
 
     return 0;
@@ -129,7 +129,7 @@
 static int amr_read_packet(AVFormatContext *s,
                           AVPacket *pkt)
 {
-    AVCodecContext *enc = &s->streams[0]->codec;
+    AVCodecContext *enc = s->streams[0]->codec;
 
     if (enc->codec_id == CODEC_ID_AMR_NB)
     {