[FFmpeg-cvslog] lavf/concatdec: reindent after last commit.
Nicolas George
git at videolan.org
Tue Apr 29 19:43:51 CEST 2014
ffmpeg | branch: master | Nicolas George <george at nsup.org> | Mon Apr 14 11:58:17 2014 +0200| [9d24a536a3d2f6a5639eac47b421af15d9b789d3] | committer: Nicolas George
lavf/concatdec: reindent after last commit.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d24a536a3d2f6a5639eac47b421af15d9b789d3
---
libavformat/concatdec.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 98f4160..5751d0c 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;
}
More information about the ffmpeg-cvslog
mailing list