[FFmpeg-cvslog] ffmpeg: reindent after previous commit

Clément Bœsch git at videolan.org
Tue Jul 18 11:40:45 EEST 2017


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Tue Jul 18 10:24:40 2017 +0200| [d7ea14c5e22891b09d14a1e3cde5358146e32a40] | committer: Clément Bœsch

ffmpeg: reindent after previous commit

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7ea14c5e22891b09d14a1e3cde5358146e32a40
---

 ffmpeg_opt.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 610082de17..1c4a11ef21 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1058,23 +1058,22 @@ static int open_input_file(OptionsContext *o, const char *filename)
         AVDictionary **opts = setup_find_stream_info_opts(ic, o->g->codec_opts);
         int orig_nb_streams = ic->nb_streams;
 
-        // TODO: reindent
-    /* If not enough info to get the stream parameters, we decode the
-       first frames to get it. (used in mpeg case for example) */
-    ret = avformat_find_stream_info(ic, opts);
+        /* If not enough info to get the stream parameters, we decode the
+           first frames to get it. (used in mpeg case for example) */
+        ret = avformat_find_stream_info(ic, opts);
 
-    for (i = 0; i < orig_nb_streams; i++)
-        av_dict_free(&opts[i]);
-    av_freep(&opts);
+        for (i = 0; i < orig_nb_streams; i++)
+            av_dict_free(&opts[i]);
+        av_freep(&opts);
 
-    if (ret < 0) {
-        av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
-        if (ic->nb_streams == 0) {
-            avformat_close_input(&ic);
-            exit_program(1);
+        if (ret < 0) {
+            av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
+            if (ic->nb_streams == 0) {
+                avformat_close_input(&ic);
+                exit_program(1);
+            }
         }
     }
-    }
 
     if (o->start_time_eof != AV_NOPTS_VALUE) {
         if (ic->duration>0) {



More information about the ffmpeg-cvslog mailing list