diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2009-03-16 12:50:12 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2009-03-16 12:50:12 +0000 |
| commit | 7268f0bd8e8586434b6ce15f2e65ae279fe58e02 (patch) | |
| tree | 79741d386cb72cc0e1f4a8ab29d241287f978560 | |
| parent | 8127c4208ce486921270e52aed1970f0fe792dcc (diff) | |
| download | ffmpeg-7268f0bd8e8586434b6ce15f2e65ae279fe58e02.tar.gz | |
Reindent after r18005.
Originally committed as revision 18007 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/rmdec.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index a6e520a797..1303b9f5c4 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -710,33 +710,33 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt) int old_flags, flags; for (;;) { - if (rm->audio_pkt_cnt) { - // If there are queued audio packet return them first - st = s->streams[rm->audio_stream_num]; - ff_rm_retrieve_cache(s, s->pb, st, st->priv_data, pkt); + if (rm->audio_pkt_cnt) { + // If there are queued audio packet return them first + st = s->streams[rm->audio_stream_num]; + ff_rm_retrieve_cache(s, s->pb, st, st->priv_data, pkt); } else { if (rm->old_format) { - RMStream *ast; + RMStream *ast; - st = s->streams[0]; - ast = st->priv_data; + st = s->streams[0]; + ast = st->priv_data; timestamp = AV_NOPTS_VALUE; len = !ast->audio_framesize ? RAW_PACKET_SIZE : ast->coded_framesize * ast->sub_packet_h / 2; flags = (seq++ == 1) ? 2 : 0; - } else { - len=sync(s, ×tamp, &flags, &i, &pos); - st = s->streams[i]; + } else { + len=sync(s, ×tamp, &flags, &i, &pos); + st = s->streams[i]; } if(len<0 || url_feof(s->pb)) return AVERROR(EIO); - old_flags = flags; - res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt, - &seq, &flags, ×tamp); - if((old_flags&2) && (seq&0x7F) == 1) - av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME); + old_flags = flags; + res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt, + &seq, &flags, ×tamp); + if((old_flags&2) && (seq&0x7F) == 1) + av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME); if (res) continue; } |