highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility

Browse Source 
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2005-07-17 22:24:36 +00:00
parent 4c1a012e9c
commit 01f4895c68
56 changed files with 1023 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/psxstr.c
View File

@@ -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;