diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-07-17 22:24:36 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-07-17 22:24:36 +0000 |
| commit | 01f4895c682a1752bf6d138ffb0628470e16b85a (patch) | |
| tree | 56a3dfce270dad38b97c8f7ff288cc23cfac54da /libavformat/amr.c | |
| parent | 4c1a012e9ceb0840688c547625208e7c4b81624a (diff) | |
| download | ffmpeg-01f4895c682a1752bf6d138ffb0628470e16b85a.tar.gz | |
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/amr.c')
| -rw-r--r-- | libavformat/amr.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c index 64c387b5ee..cbe8695330 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -31,7 +31,7 @@ static const unsigned char AMRWB_header [] = "#!AMR-WB\n"; 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 @@ static int amr_read_header(AVFormatContext *s, 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 @@ static int amr_read_header(AVFormatContext *s, 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_header(AVFormatContext *s, 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) { |