Commit daa7a1ec authored by rbultje's avatar rbultje

Reindent after r18005.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18007 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 6aa28462
...@@ -710,33 +710,33 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -710,33 +710,33 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
int old_flags, flags; int old_flags, flags;
for (;;) { for (;;) {
if (rm->audio_pkt_cnt) { if (rm->audio_pkt_cnt) {
// If there are queued audio packet return them first // If there are queued audio packet return them first
st = s->streams[rm->audio_stream_num]; st = s->streams[rm->audio_stream_num];
ff_rm_retrieve_cache(s, s->pb, st, st->priv_data, pkt); ff_rm_retrieve_cache(s, s->pb, st, st->priv_data, pkt);
} else { } else {
if (rm->old_format) { if (rm->old_format) {
RMStream *ast; RMStream *ast;
st = s->streams[0]; st = s->streams[0];
ast = st->priv_data; ast = st->priv_data;
timestamp = AV_NOPTS_VALUE; timestamp = AV_NOPTS_VALUE;
len = !ast->audio_framesize ? RAW_PACKET_SIZE : len = !ast->audio_framesize ? RAW_PACKET_SIZE :
ast->coded_framesize * ast->sub_packet_h / 2; ast->coded_framesize * ast->sub_packet_h / 2;
flags = (seq++ == 1) ? 2 : 0; flags = (seq++ == 1) ? 2 : 0;
} else { } else {
len=sync(s, &timestamp, &flags, &i, &pos); len=sync(s, &timestamp, &flags, &i, &pos);
st = s->streams[i]; st = s->streams[i];
} }
if(len<0 || url_feof(s->pb)) if(len<0 || url_feof(s->pb))
return AVERROR(EIO); return AVERROR(EIO);
old_flags = flags; old_flags = flags;
res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt, res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt,
&seq, &flags, &timestamp); &seq, &flags, &timestamp);
if((old_flags&2) && (seq&0x7F) == 1) if((old_flags&2) && (seq&0x7F) == 1)
av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME); av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME);
if (res) if (res)
continue; continue;
} }
......
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