diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-04-11 10:41:06 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-04-11 10:41:06 +0000 |
| commit | 46e97dc3c2281954fabe273c9e05f458ea2599e4 (patch) | |
| tree | 85644e87b3c2cb2f8fcd43082768754688a7017e | |
| parent | f772b7fa7d57cba2e81727c7af29110f9556f06f (diff) | |
| download | ffmpeg-46e97dc3c2281954fabe273c9e05f458ea2599e4.tar.gz | |
Reindent
Originally committed as revision 18429 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/electronicarts.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index eb18c5a93d..90823a18e8 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -472,26 +472,26 @@ static int ea_read_packet(AVFormatContext *s, ret = av_get_packet(pb, pkt, chunk_size); if (ret < 0) return ret; - pkt->stream_index = ea->audio_stream_index; - pkt->pts = 90000; - pkt->pts *= ea->audio_frame_counter; - pkt->pts /= ea->sample_rate; - - switch (ea->audio_codec) { - case CODEC_ID_ADPCM_EA: - /* 2 samples/byte, 1 or 2 samples per frame depending - * on stereo; chunk also has 12-byte header */ - ea->audio_frame_counter += ((chunk_size - 12) * 2) / - ea->num_channels; - break; - case CODEC_ID_PCM_S16LE_PLANAR: - case CODEC_ID_MP3: - ea->audio_frame_counter += num_samples; - break; - default: - ea->audio_frame_counter += chunk_size / - (ea->bytes * ea->num_channels); - } + pkt->stream_index = ea->audio_stream_index; + pkt->pts = 90000; + pkt->pts *= ea->audio_frame_counter; + pkt->pts /= ea->sample_rate; + + switch (ea->audio_codec) { + case CODEC_ID_ADPCM_EA: + /* 2 samples/byte, 1 or 2 samples per frame depending + * on stereo; chunk also has 12-byte header */ + ea->audio_frame_counter += ((chunk_size - 12) * 2) / + ea->num_channels; + break; + case CODEC_ID_PCM_S16LE_PLANAR: + case CODEC_ID_MP3: + ea->audio_frame_counter += num_samples; + break; + default: + ea->audio_frame_counter += chunk_size / + (ea->bytes * ea->num_channels); + } packet_read = 1; break; @@ -531,8 +531,8 @@ get_video_packet: ret = av_get_packet(pb, pkt, chunk_size); if (ret < 0) return ret; - pkt->stream_index = ea->video_stream_index; - pkt->flags |= key; + pkt->stream_index = ea->video_stream_index; + pkt->flags |= key; packet_read = 1; break; |