diff options
| author | Diego Biurrun <diego@biurrun.de> | 2005-12-17 18:14:38 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-12-17 18:14:38 +0000 |
| commit | 115329f16062074e11ccf3b89ead6176606c9696 (patch) | |
| tree | e98aa993905a702688bf821737ab9a443969fc28 /libavformat/4xm.c | |
| parent | d76319b1ab716320f6e6a4d690b85fe4504ebd5b (diff) | |
| download | ffmpeg-115329f16062074e11ccf3b89ead6176606c9696.tar.gz | |
COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/4xm.c')
| -rw-r--r-- | libavformat/4xm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 6826511fcb..9ff496e7b3 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -163,7 +163,7 @@ static int fourxm_read_header(AVFormatContext *s, fourxm->track_count = current_track + 1; if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack)) return -1; - fourxm->tracks = av_realloc(fourxm->tracks, + fourxm->tracks = av_realloc(fourxm->tracks, fourxm->track_count * sizeof(AudioTrack)); if (!fourxm->tracks) { av_free(header); @@ -277,7 +277,7 @@ static int fourxm_read_packet(AVFormatContext *s, ret= av_get_packet(&s->pb, pkt, size); if(ret<0) return AVERROR_IO; - pkt->stream_index = + pkt->stream_index = fourxm->tracks[fourxm->selected_track].stream_index; pkt->pts = fourxm->audio_pts; packet_read = 1; @@ -285,13 +285,13 @@ static int fourxm_read_packet(AVFormatContext *s, /* pts accounting */ audio_frame_count = size; if (fourxm->tracks[fourxm->selected_track].adpcm) - audio_frame_count -= + audio_frame_count -= 2 * (fourxm->tracks[fourxm->selected_track].channels); audio_frame_count /= fourxm->tracks[fourxm->selected_track].channels; if (fourxm->tracks[fourxm->selected_track].adpcm) audio_frame_count *= 2; - else + else audio_frame_count /= (fourxm->tracks[fourxm->selected_track].bits / 8); fourxm->audio_pts += audio_frame_count; |