[FFmpeg-cvslog] lavf/concatdec: reindent after last commit.
Nicolas George
git at videolan.org
Sat Mar 8 15:01:08 CET 2014
ffmpeg | branch: master | Nicolas George <george at nsup.org> | Sat Mar 8 12:44:45 2014 +0100| [6bffa83bbeac4820f7705188e20f2e307e832fd7] | committer: Nicolas George
lavf/concatdec: reindent after last commit.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bffa83bbeac4820f7705188e20f2e307e832fd7
---
libavformat/concatdec.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 99f0b68..71b9f7c 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -101,12 +101,11 @@ static int add_file(AVFormatContext *avf, char *filename, ConcatFile **rfile,
url = filename;
filename = NULL;
} else {
- /* TODO reindent */
- url_len = strlen(avf->filename) + strlen(filename) + 16;
- if (!(url = av_malloc(url_len)))
- FAIL(AVERROR(ENOMEM));
- ff_make_absolute_url(url, url_len, avf->filename, filename);
- av_freep(&filename);
+ url_len = strlen(avf->filename) + strlen(filename) + 16;
+ if (!(url = av_malloc(url_len)))
+ FAIL(AVERROR(ENOMEM));
+ ff_make_absolute_url(url, url_len, avf->filename, filename);
+ av_freep(&filename);
}
if (cat->nb_files >= *nb_files_alloc) {
More information about the ffmpeg-cvslog
mailing list