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/segafilm.c | |
| parent | 4c1a012e9ceb0840688c547625208e7c4b81624a (diff) | |
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/segafilm.c')
| -rw-r--r-- | libavformat/segafilm.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index d2954881ed..7727462e21 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -140,11 +140,11 @@ static int film_read_header(AVFormatContext *s, if (!st) return AVERROR_NOMEM; film->video_stream_index = st->index; - st->codec.codec_type = CODEC_TYPE_VIDEO; - st->codec.codec_id = film->video_type; - st->codec.codec_tag = 0; /* no fourcc */ - st->codec.width = BE_32(&scratch[16]); - st->codec.height = BE_32(&scratch[12]); + st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_id = film->video_type; + st->codec->codec_tag = 0; /* no fourcc */ + st->codec->width = BE_32(&scratch[16]); + st->codec->height = BE_32(&scratch[12]); } if (film->audio_type) { @@ -152,16 +152,16 @@ static int film_read_header(AVFormatContext *s, if (!st) return AVERROR_NOMEM; film->audio_stream_index = st->index; - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_id = film->audio_type; - st->codec.codec_tag = 1; - st->codec.channels = film->audio_channels; - st->codec.bits_per_sample = film->audio_bits; - st->codec.sample_rate = film->audio_samplerate; - st->codec.bit_rate = st->codec.channels * st->codec.sample_rate * - st->codec.bits_per_sample; - st->codec.block_align = st->codec.channels * - st->codec.bits_per_sample / 8; + st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_id = film->audio_type; + st->codec->codec_tag = 1; + st->codec->channels = film->audio_channels; + st->codec->bits_per_sample = film->audio_bits; + st->codec->sample_rate = film->audio_samplerate; + st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * + st->codec->bits_per_sample; + st->codec->block_align = st->codec->channels * + st->codec->bits_per_sample / 8; } /* load the sample table */ |