RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/concatdec: reindent after last commit.

This commit is contained in:
Nicolas George 2014-04-14 11:58:17 +02:00
parent b24d6c5303
commit 9d24a536a3
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/concatdec.c
View File

@ -406,17 +406,16 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
}
if (ret < 0)
return ret;
/* TODO reindent */
if ((ret = match_streams(avf)) < 0) {
av_packet_unref(pkt);
return ret;
}
cs = &cat->cur_file->streams[pkt->stream_index];
if (cs->out_stream_index < 0) {
av_packet_unref(pkt);
continue;
}
pkt->stream_index = cs->out_stream_index;
if ((ret = match_streams(avf)) < 0) {
av_packet_unref(pkt);
return ret;
}
cs = &cat->cur_file->streams[pkt->stream_index];
if (cs->out_stream_index < 0) {
av_packet_unref(pkt);
continue;
}
pkt->stream_index = cs->out_stream_index;
break;
}