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/electronicarts.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/electronicarts.c')
| -rw-r--r-- | libavformat/electronicarts.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 2d8bdadb57..7101652dc0 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -188,9 +188,9 @@ static int ea_read_header(AVFormatContext *s, return AVERROR_NOMEM; av_set_pts_info(st, 33, 1, 90000); ea->video_stream_index = st->index; - st->codec.codec_type = CODEC_TYPE_VIDEO; - st->codec.codec_id = CODEC_ID_EA_MJPEG; - st->codec.codec_tag = 0; /* no fourcc */ + st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_EA_MJPEG; + st->codec->codec_tag = 0; /* no fourcc */ #endif /* initialize the audio decoder stream */ @@ -198,15 +198,15 @@ static int ea_read_header(AVFormatContext *s, if (!st) return AVERROR_NOMEM; av_set_pts_info(st, 33, 1, EA_SAMPLE_RATE); - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_id = CODEC_ID_ADPCM_EA; - st->codec.codec_tag = 0; /* no tag */ - st->codec.channels = ea->num_channels; - st->codec.sample_rate = EA_SAMPLE_RATE; - st->codec.bits_per_sample = EA_BITS_PER_SAMPLE; - st->codec.bit_rate = st->codec.channels * st->codec.sample_rate * - st->codec.bits_per_sample / 4; - st->codec.block_align = st->codec.channels * st->codec.bits_per_sample; + st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_id = CODEC_ID_ADPCM_EA; + st->codec->codec_tag = 0; /* no tag */ + st->codec->channels = ea->num_channels; + st->codec->sample_rate = EA_SAMPLE_RATE; + st->codec->bits_per_sample = EA_BITS_PER_SAMPLE; + st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * + st->codec->bits_per_sample / 4; + st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; ea->audio_stream_index = st->index; ea->audio_frame_counter = 0; |