Commit 46e97dc3 authored by Reimar Döffinger's avatar Reimar Döffinger
Browse files

Reindent

Originally committed as revision 18429 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f772b7fa
...@@ -472,26 +472,26 @@ static int ea_read_packet(AVFormatContext *s, ...@@ -472,26 +472,26 @@ static int ea_read_packet(AVFormatContext *s,
ret = av_get_packet(pb, pkt, chunk_size); ret = av_get_packet(pb, pkt, chunk_size);
if (ret < 0) if (ret < 0)
return ret; return ret;
pkt->stream_index = ea->audio_stream_index; pkt->stream_index = ea->audio_stream_index;
pkt->pts = 90000; pkt->pts = 90000;
pkt->pts *= ea->audio_frame_counter; pkt->pts *= ea->audio_frame_counter;
pkt->pts /= ea->sample_rate; pkt->pts /= ea->sample_rate;
switch (ea->audio_codec) { switch (ea->audio_codec) {
case CODEC_ID_ADPCM_EA: case CODEC_ID_ADPCM_EA:
/* 2 samples/byte, 1 or 2 samples per frame depending /* 2 samples/byte, 1 or 2 samples per frame depending
* on stereo; chunk also has 12-byte header */ * on stereo; chunk also has 12-byte header */
ea->audio_frame_counter += ((chunk_size - 12) * 2) / ea->audio_frame_counter += ((chunk_size - 12) * 2) /
ea->num_channels; ea->num_channels;
break; break;
case CODEC_ID_PCM_S16LE_PLANAR: case CODEC_ID_PCM_S16LE_PLANAR:
case CODEC_ID_MP3: case CODEC_ID_MP3:
ea->audio_frame_counter += num_samples; ea->audio_frame_counter += num_samples;
break; break;
default: default:
ea->audio_frame_counter += chunk_size / ea->audio_frame_counter += chunk_size /
(ea->bytes * ea->num_channels); (ea->bytes * ea->num_channels);
} }
packet_read = 1; packet_read = 1;
break; break;
...@@ -531,8 +531,8 @@ get_video_packet: ...@@ -531,8 +531,8 @@ get_video_packet:
ret = av_get_packet(pb, pkt, chunk_size); ret = av_get_packet(pb, pkt, chunk_size);
if (ret < 0) if (ret < 0)
return ret; return ret;
pkt->stream_index = ea->video_stream_index; pkt->stream_index = ea->video_stream_index;
pkt->flags |= key; pkt->flags |= key;
packet_read = 1; packet_read = 1;
break; break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment