diff options
author | Nicolas George <george@nsup.org> | 2014-04-14 11:58:17 +0200 |
---|---|---|
committer | Nicolas George <george@nsup.org> | 2014-04-29 13:25:59 +0200 |
commit | 9d24a536a3d2f6a5639eac47b421af15d9b789d3 (patch) | |
tree | bfbb7db154879c4cce94b0ce26e26586c00a64bb /libavformat/concatdec.c | |
parent | b24d6c53037aaaa20fbd59cbd25c392229450660 (diff) | |
download | ffmpeg-9d24a536a3d2f6a5639eac47b421af15d9b789d3.tar.gz |
lavf/concatdec: reindent after last commit.
Diffstat (limited to 'libavformat/concatdec.c')
-rw-r--r-- | libavformat/concatdec.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 98f4160f2e..5751d0c726 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -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; } |