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/psxstr.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/psxstr.c')
| -rw-r--r-- | libavformat/psxstr.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index c8c3b2915a..51afe1b5af 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -182,11 +182,11 @@ static int str_read_header(AVFormatContext *s, str->channels[channel].video_stream_index = st->index; - st->codec.codec_type = CODEC_TYPE_VIDEO; - st->codec.codec_id = CODEC_ID_MDEC; - st->codec.codec_tag = 0; /* no fourcc */ - st->codec.width = str->channels[channel].width; - st->codec.height = str->channels[channel].height; + st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_MDEC; + st->codec->codec_tag = 0; /* no fourcc */ + st->codec->width = str->channels[channel].width; + st->codec->height = str->channels[channel].height; } break; @@ -212,13 +212,13 @@ static int str_read_header(AVFormatContext *s, str->channels[channel].audio_stream_index = st->index; fmt = sector[0x13]; - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_id = CODEC_ID_ADPCM_XA; - st->codec.codec_tag = 0; /* no fourcc */ - st->codec.channels = (fmt&1)?2:1; - st->codec.sample_rate = (fmt&4)?18900:37800; - // st->codec.bit_rate = 0; //FIXME; - st->codec.block_align = 128; + st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_id = CODEC_ID_ADPCM_XA; + st->codec->codec_tag = 0; /* no fourcc */ + st->codec->channels = (fmt&1)?2:1; + st->codec->sample_rate = (fmt&4)?18900:37800; + // st->codec->bit_rate = 0; //FIXME; + st->codec->block_align = 128; } break; |