diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-01-27 21:09:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-01-27 21:09:22 +0000 |
| commit | 4f989885b6fdbb5ae0de8955056173e88544bc18 (patch) | |
| tree | ac1db3ad5ac9c12cc2709204a57386136d630d54 /libavformat/4xm.c | |
| parent | cc988dd77f484ad4a928432b6d46713cb5f4ce24 (diff) | |
| download | ffmpeg-4f989885b6fdbb5ae0de8955056173e88544bc18.tar.gz | |
vertical align
Originally committed as revision 16832 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/4xm.c')
| -rw-r--r-- | libavformat/4xm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index acaa9f8517..65963193b7 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -139,7 +139,7 @@ static int fourxm_read_header(AVFormatContext *s, av_free(header); return AVERROR_INVALIDDATA; } - fourxm->width = AV_RL32(&header[i + 36]); + fourxm->width = AV_RL32(&header[i + 36]); fourxm->height = AV_RL32(&header[i + 40]); /* allocate a new AVStream */ @@ -157,7 +157,7 @@ static int fourxm_read_header(AVFormatContext *s, st->codec->extradata_size = 4; st->codec->extradata = av_malloc(4); AV_WL32(st->codec->extradata, AV_RL32(&header[i + 16])); - st->codec->width = fourxm->width; + st->codec->width = fourxm->width; st->codec->height = fourxm->height; i += 8 + size; @@ -181,10 +181,10 @@ static int fourxm_read_header(AVFormatContext *s, return AVERROR(ENOMEM); } } - fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]); - fourxm->tracks[current_track].channels = AV_RL32(&header[i + 36]); + fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]); + fourxm->tracks[current_track].channels = AV_RL32(&header[i + 36]); fourxm->tracks[current_track].sample_rate = AV_RL32(&header[i + 40]); - fourxm->tracks[current_track].bits = AV_RL32(&header[i + 44]); + fourxm->tracks[current_track].bits = AV_RL32(&header[i + 44]); i += 8 + size; /* allocate a new AVStream */ @@ -200,10 +200,10 @@ static int fourxm_read_header(AVFormatContext *s, st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_tag = 0; - st->codec->channels = fourxm->tracks[current_track].channels; - st->codec->sample_rate = fourxm->tracks[current_track].sample_rate; + st->codec->channels = fourxm->tracks[current_track].channels; + st->codec->sample_rate = fourxm->tracks[current_track].sample_rate; st->codec->bits_per_coded_sample = fourxm->tracks[current_track].bits; - st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * + st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample; st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; if (fourxm->tracks[current_track].adpcm) |