[FFmpeg-cvslog] movenc: Reindent a block

Martin Storsjö git at videolan.org
Thu Jan 26 03:20:22 CET 2012


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Jan 25 12:40:05 2012 +0200| [990a746cec2fb82ca76b3a6fc28b35006e8d39bf] | committer: Martin Storsjö

movenc: Reindent a block

Also add some space around operators and wrap a comment
that extends past the 80 char "limit"/guideline.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/movenc.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 95d92aa..5e8bed2 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2863,20 +2863,22 @@ static int mov_write_trailer(AVFormatContext *s)
     int64_t moov_pos = avio_tell(pb);
 
     if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) {
-    /* Write size of mdat tag */
-    if (mov->mdat_size+8 <= UINT32_MAX) {
-        avio_seek(pb, mov->mdat_pos, SEEK_SET);
-        avio_wb32(pb, mov->mdat_size+8);
-    } else {
-        /* overwrite 'wide' placeholder atom */
-        avio_seek(pb, mov->mdat_pos - 8, SEEK_SET);
-        avio_wb32(pb, 1); /* special value: real atom size will be 64 bit value after tag field */
-        ffio_wfourcc(pb, "mdat");
-        avio_wb64(pb, mov->mdat_size+16);
-    }
-    avio_seek(pb, moov_pos, SEEK_SET);
+        /* Write size of mdat tag */
+        if (mov->mdat_size + 8 <= UINT32_MAX) {
+            avio_seek(pb, mov->mdat_pos, SEEK_SET);
+            avio_wb32(pb, mov->mdat_size + 8);
+        } else {
+            /* overwrite 'wide' placeholder atom */
+            avio_seek(pb, mov->mdat_pos - 8, SEEK_SET);
+            /* special value: real atom size will be 64 bit value after
+             * tag field */
+            avio_wb32(pb, 1);
+            ffio_wfourcc(pb, "mdat");
+            avio_wb64(pb, mov->mdat_size + 16);
+        }
+        avio_seek(pb, moov_pos, SEEK_SET);
 
-    mov_write_moov_tag(pb, mov, s);
+        mov_write_moov_tag(pb, mov, s);
     } else {
         mov_flush_fragment(s);
         mov_write_mfra_tag(pb, mov);



More information about the ffmpeg-cvslog mailing list