Mercurial > libavformat.hg
diff psxstr.c @ 885:da1d5db0ce5c libavformat
COSMETICS: Remove all trailing whitespace.
| author | diego |
|---|---|
| date | Sat, 17 Dec 2005 18:14:38 +0000 |
| parents | 4cf524326a1a |
| children | edbe5c3717f9 |
line wrap: on
line diff
--- a/psxstr.c Sat Dec 17 17:57:03 2005 +0000 +++ b/psxstr.c Sat Dec 17 18:14:38 2005 +0000 @@ -182,7 +182,7 @@ 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_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; @@ -195,11 +195,11 @@ int fmt; str->audio_channel = channel; str->channels[channel].type = STR_AUDIO; - str->channels[channel].channels = + str->channels[channel].channels = (sector[0x13] & 0x01) ? 2 : 1; - str->channels[channel].sample_rate = + str->channels[channel].sample_rate = (sector[0x13] & 0x04) ? 18900 : 37800; - str->channels[channel].bits = + str->channels[channel].bits = (sector[0x13] & 0x10) ? 8 : 4; /* allocate a new AVStream */ @@ -212,7 +212,7 @@ fmt = sector[0x13]; st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_XA; + 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; @@ -232,7 +232,7 @@ str->channels[str->video_channel].width, str->channels[str->video_channel].height,str->channels[str->video_channel].video_stream_index); if (str->audio_channel != -1) - av_log (s, AV_LOG_DEBUG, " audio channel = %d, %d Hz, %d channels, %d bits/sample %d\n", + av_log (s, AV_LOG_DEBUG, " audio channel = %d, %d Hz, %d channels, %d bits/sample %d\n", str->audio_channel, str->channels[str->audio_channel].sample_rate, str->channels[str->audio_channel].channels, @@ -283,7 +283,7 @@ return AVERROR_IO; pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE; - pkt->stream_index = + pkt->stream_index = str->channels[channel].video_stream_index; // pkt->pts = str->pts; @@ -320,7 +320,7 @@ return AVERROR_IO; memcpy(pkt->data,sector+24,2304); - pkt->stream_index = + pkt->stream_index = str->channels[channel].audio_stream_index; //pkt->pts = str->pts; return 0;
